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

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -524,6 +524,10 @@
           </ul>
         </div>
       </div>
+      
+      <!-- <div style="margin-left: 1150px; margin-bottom: 10px;">
+        <el-button type="primary" size="small" @toClicK="toExport">导出</el-button>
+      </div> -->
 
       <el-table
         :row-style="{ color: '#303133' }"
@@ -2205,6 +2209,32 @@ export default {
       } else if (this.template_id == 33) {
         this.$router.push({ path: "/dialysis/print/batch/thirtyThree_two" });
       }
+    },
+    toExport(){
+      import('@/vendor/Export2Excel').then(excel => { 
+         
+         console.log("监测统计",this.SchedualPatientsTableData)
+        
+         const tHeader = ['序号','机号','规格','数量']
+         const filterVal = ['index','advice_name','specification_name','total_count']
+
+         const data = this.formatJson(filterVal, this.tableList)
+         excel.export_json_to_excel({
+           header: tHeader,
+           data,
+           filename: '药品统计'
+         })
+           this.downloadLoading = false
+         })  
+    },
+    formatJson(filterVal, jsonData) {
+      return jsonData.map(v => filterVal.map(j => {
+        if (j === 'timestamp') {
+          return parseTime(v[j])
+        } else {
+          return v[j]
+        }
+      }))
     }
   },
   components: {

src/xt_pages/qcd/statisticalConfiguration.vue

@@ -69,8 +69,8 @@
           <el-pagination
               @size-change="handleSizeChange"
               @current-change="handleCurrentChange"
-              :page-sizes="[12, 20, 30, 100]"
-              :page-size="12"
+              :page-sizes="[10, 20, 30, 100]"
+              :page-size="10"
               background
               style="margin-top:20px;float: right"
               layout="total, sizes, prev, pager, next, jumper"
@@ -485,7 +485,7 @@ export default {
           this.configuraData = configurationlist
           var total = response.data.data.total
           // console.log("total",total)
-          this.total = total+2
+          this.total = total
         }
       })
     },

src/xt_pages/stock/detail/cancelStockDetail.vue

@@ -257,7 +257,9 @@ export default {
       tableDataList:[],
       table:[],
       houseList:[],
-      storehouse_id:0
+      storehouse_id:0,
+      manufacturerList:[],
+      dealerList:[],
     };
   },
   methods: {
@@ -399,9 +401,11 @@ export default {
           }
           console.log("list232323232322332232323ow",this.cancelStockDate)
           this.tableDataList = response.data.data.list
-
+          this.manufacturerList = response.data.data.manufacturerList
+          this.dealerList = response.data.data.dealerList
           var listgroup = response.data.data.listgroup
-
+          
+          this.
 
           this.cancelStockDate.push({
             order_number: "合计",
@@ -425,6 +429,25 @@ export default {
         }
       });
     },
+    getManufacturerNameOne(id){
+        var manufacturer_name = ""
+        for(let i=0;i<this.manufacturerList.length;i++){
+          if(id == this.manufacturerList[i].id){
+            manufacturer_name = this.manufacturerList[i].manufacturer_name
+          }
+        }
+        return manufacturer_name
+     },
+     getDealerNameOne(id){
+       var dealer_name = ""
+     
+       for(let i=0;i<this.dealerList.length;i++){
+          if(id == this.dealerList[i].id){
+              dealer_name = this.dealerList[i].dealer_name
+          }
+       }
+       return dealer_name
+     }, 
     getXuserName(id) {
       if (id <= 0) {
         return "";
@@ -625,7 +648,6 @@ export default {
         .catch(() => {});
     },
       exportList(){
-        console.log("hhhhhh",this.tableList)
         for(let i=0;i<this.tableList.length;i++){
           this.tableList[i].index = i+1
           this.tableList[i].good_name = this.tableList[i].GoodInfo.good_name
@@ -633,6 +655,8 @@ export default {
           this.tableList[i].packing_unit = this.tableList[i].GoodInfo.packing_unit
           this.tableList[i].total = this.getTotalCount(this.tableList[i].child)
           this.tableList[i].total_price = (this.tableList[i].total * this.tableList[i].price).toFixed(2)
+          this.tableList[i].manufacturer_name = this.getManufacturerNameOne(this.tableList[i].manufacturer)
+          this.tableList[i].dealer_name = this.getDealerNameOne(this.tableList[i].dealer)
 
         }
        var obj = {"index":"合计","total_price":0}
@@ -640,7 +664,7 @@ export default {
            obj.total_price +=this.tableList[i].total * this.tableList[i].price
        }
        obj.total_price = obj.total_price.toFixed(2)
-       console.log("obj23233",obj)
+      
        this.tableList.push(obj)
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','退库价','总价','备注']
@@ -669,7 +693,10 @@ export default {
           this.tableDataList[i].user_name = this.getXuserName(this.tableDataList[i].CancelStock.creater)
           this.tableDataList[i].out_count = this.tableDataList[i].count
           this.tableDataList[i].total_price = (this.tableDataList[i].count * this.tableDataList[i].price).toFixed(2)
+          this.tableDataList[i].manufacturer_name = this.getManufacturerNameOne(this.tableDataList[i].manufacturer)
+          this.tableDataList[i].dealer_name = this.getDealerNameOne(this.tableDataList[i].dealer)
           total += this.tableDataList[i].count * this.tableDataList[i].price
+
         }
         obj.total_price = total.toFixed(2)
         this.tableDataList.push(obj)

src/xt_pages/stock/detail/stockInDetail.vue

@@ -265,6 +265,8 @@ export default {
       tableDataList:[],
       houseList:[],
       storehouse_id:0,
+      manufacturerList:[],
+      dealerList:[],
     };
   },
   methods: {
@@ -345,6 +347,8 @@ export default {
             obj["is_total"] = 0;
             this.cancelStockDate.push(obj);
           }
+          this.manufacturerList = response.data.data.manufacturerList
+          this.dealerList = response.data.data.dealerList
 
           this.cancelStockDate.push({
             warehousing_order: "合计",
@@ -405,7 +409,9 @@ export default {
             this.cancelStockDate.push(obj);
           }
           this.tableDataList = response.data.data.list
-          console.log("表格发3223332322332332323232332233",this.cancelStockDate)
+          this.manufacturerList = response.data.data.manufacturerList
+          this.dealerList = response.data.data.dealerList
+        
 
           this.cancelStockDate.push({
             warehousing_order: "合计",
@@ -772,11 +778,13 @@ export default {
         for(let i=0;i<this.tableInfo.length;i++){
           this.tableInfo[i].index = i+1
           this.tableInfo[i].total_price = (this.tableInfo[i].warehousing_count * this.tableInfo[i].price).toFixed(2)
+          this.tableInfo[i].manufacturer_name = this.getManufactuerName(this.tableInfo[i].manufacturer)
+          this.tableInfo[i].dealer_name = this.getDealerName(this.tableInfo[i].dealer)
         }
 
         import('@/vendor/Export2Excel').then(excel => {
-        const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','进货价','总价','备注']
-        const filterVal = ['index','good_name', 'specification_name', 'packing_unit','warehousing_count','price','total_price','remark']
+        const tHeader = ['序号','耗材名称', '规格型号','生产厂商','进销商', '单位','数量','进货价','总价','备注']
+        const filterVal = ['index','good_name', 'specification_name','manufacturer_name','dealer_name', 'packing_unit','warehousing_count','price','total_price','remark']
 
 
         const data = this.formatJson(filterVal, this.tableInfo)
@@ -790,10 +798,29 @@ export default {
             this.downloadLoading = false
         })
       },
+        getManufacturerName(id){
+          var manufacturer_name = ""
+          for(let i=0;i<this.manufacturerList.length;i++){
+            if(id == this.manufacturerList[i].id){
+              manufacturer_name = this.manufacturerList[i].manufacturer_name
+            }
+          }
+          return manufacturer_name
+      },
+      getDealerName(id){
+        var dealer_name = ""
+        for(let i=0;i<this.dealerList.length;i++){
+            if(id == this.dealerList[i].id){
+                dealer_name = this.dealerList[i].dealer_name
+            }
+        }
+        return dealer_name
+      }, 
       exportListDetal(){
 
         var obj = {index:"合计",total_price:0}
         var total = 0
+        console.log("wowowows",this.tableDataList)
         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)
@@ -802,18 +829,21 @@ export default {
           this.tableDataList[i].time = this.getTime(this.tableDataList[i].Warehousing.warehousing_time)
           this.tableDataList[i].user_name = this.getXuserName(this.tableDataList[i].Warehousing.creater)
           this.tableDataList[i].total_price = (this.tableDataList[i].warehousing_count * this.tableDataList[i].price).toFixed(2)
+          this.tableDataList[i].manufacturer_name = this.getManufactuerName(this.tableDataList[i].manufacturer)
+          this.tableDataList[i].dealer_name = this.getDealerName(this.tableDataList[i].dealer)
           total += this.tableDataList[i].warehousing_count * this.tableDataList[i].price
+          
         }
         obj.total_price = total.toFixed(2)
         this.tableDataList.push(obj)
+      
         import('@/vendor/Export2Excel').then(excel => {
-        const tHeader = ['序号','单据编号', '耗材类型', '耗材名称','规格型号','操作时间','制单人','进货价','数量','总价']
-        const filterVal = ['index','warehousing_order', 'good_type_name', 'good_name','specification_name','time','user_name','price','warehousing_count','total_price']
+        const tHeader = ['序号','单据编号', '耗材类型', '耗材名称','规格型号','生产厂商','进销商','操作时间','制单人','进货价','数量','总价']
+        const filterVal = ['index','warehousing_order', 'good_type_name', 'good_name','specification_name','manufacturer_name','dealer_name','time','user_name','price','warehousing_count','total_price']
 
 
         const data = this.formatJson(filterVal, this.tableDataList)
 
-
           excel.export_json_to_excel({
             header: tHeader,
             data,

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -117,6 +117,13 @@
           </template>
         </el-table-column>
 
+
+        <el-table-column label="生产厂商" align="center">
+          <template slot-scope="scope">
+            {{ getManufactuerName(scope.row.manufacturer) }}
+          </template>
+        </el-table-column>
+
         <!-- <el-table-column label="单据类型" align="center">
           <template slot-scope="scope">
             {{ getTypeName(scope.row) }}
@@ -271,6 +278,8 @@ export default {
       storehouse_id:0,
       houseList:[],
       wareOutList:[],
+      manufacturerList:[],
+      dealerList:[],
     };
   },
   methods: {
@@ -431,6 +440,8 @@ export default {
           }
 
           this.tableDataList = response.data.data.list
+          this.manufacturerList = response.data.data.manufacturerList
+          this.dealerList = response.data.data.dealerList
 
           this.cancelStockDate.push(objOne);
 
@@ -531,6 +542,25 @@ export default {
         }
       });
     },
+    getManufacturerNameOne(id){
+        var manufacturer_name = ""
+        for(let i=0;i<this.manufacturerList.length;i++){
+          if(id == this.manufacturerList[i].id){
+            manufacturer_name = this.manufacturerList[i].manufacturer_name
+          }
+        }
+        return manufacturer_name
+     },
+     getDealerNameOne(id){
+       var dealer_name = ""
+     
+       for(let i=0;i<this.dealerList.length;i++){
+          if(id == this.dealerList[i].id){
+              dealer_name = this.dealerList[i].dealer_name
+          }
+       }
+       return dealer_name
+     }, 
     getManufactuerName: function(manufacturer_id) {
       for (let i = 0; i < this.manufacturer.length; i++) {
         if (this.manufacturer[i].id == manufacturer_id) {
@@ -851,11 +881,16 @@ export default {
         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.tableOut[i].out_count = this.getStockCount(this.tableOut[i].good_id)
         }
+        this.tableOut[i].manufacturer_name = this.getManufacturerNameOne(this.tableOut[i].manufacturer)
+        console.log("继续桑",this.tableOut[i].dealer)
+        this.tableOut[i].dealer_name = this.getDealerNameOne(this.tableOut[i].dealer)
        }
+       console.log("retusoossoso",this.tableOut)
+       
        import('@/vendor/Export2Excel').then(excel => {
-       const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','出货价','总价','出库时间','备注']
+       const tHeader = ['序号','耗材名称', '规格型号','生产厂商','进销商', '单位','数量','出货价','总价','出库时间','备注']
 
-       const filterVal = ['index','good_name', 'specification_name', 'packing_unit','out_count','packing_price','total_price','ctime','remark']
+       const filterVal = ['index','good_name', 'specification_name', 'manufacturer_name','dealer_name','packing_unit','out_count','packing_price','total_price','ctime','remark']
 
        const data = this.formatJson(filterVal, this.tableOut)
 
@@ -880,6 +915,8 @@ export default {
           this.tableDataList[i].time = this.getTime(this.tableDataList[i].WarehouseOut.warehouse_out_time)
           this.tableDataList[i].user_name = this.getXuserName(this.tableDataList[i].WarehouseOut.creater)
           this.tableDataList[i].out_count = this.tableDataList[i].count
+          this.tableDataList[i].manufacturer_name = this.getManufacturerNameOne(this.tableDataList[i].GoodInfo.manufacturer)
+          this.tableDataList[i].dealer_name = this.getDealerNameOne(this.tableDataList[i].GoodInfo.dealer)
           if(this.orgId == 9919){
              this.tableDataList[i].total_price = (this.tableDataList[i].count * this.tableDataList[i].GoodInfo.buy_price).toFixed(2)
              total += this.tableDataList[i].count * this.tableDataList[i].buy_price
@@ -891,11 +928,12 @@ export default {
 
         }
         obj.total_price = total.toFixed(2)
-
+        console.log("WOHHAHHAHAH",this.tableDataList)
+      
         this.tableDataList.push(obj)
        import('@/vendor/Export2Excel').then(excel => {
-       const tHeader = ['序号','单据编号', '耗材类型', '耗材名称','规格型号','操作时间','制单人','出货价','数量','总价']
-       const filterVal = ['index','warehouse_out_order_number', 'good_type_name', 'good_name','specification_name','time','user_name','price','out_count','total_price']
+       const tHeader = ['序号','单据编号', '耗材类型', '耗材名称','规格型号','生产厂商','进销商','操作时间','制单人','出货价','数量','总价']
+       const filterVal = ['index','warehouse_out_order_number', 'good_type_name', 'good_name','specification_name','manufacturer_name','dealer_name','time','user_name','price','out_count','total_price']
 
        const data = this.formatJson(filterVal, this.tableDataList)
 

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

@@ -235,6 +235,8 @@ export default {
       tableList:[],
       tableDataList:[],
       drugTypeList:[],
+      dealerList:[],
+      manufacturerList:[]
     };
   },
   methods: {
@@ -348,6 +350,8 @@ export default {
          if(response.data.state == 1){
            var order =  response.data.data.order
            var list = response.data.data.orderPrint
+           this.dealerList =  response.data.data.dealerList
+           this.manufacturerList =  response.data.data.manufacturerList
            //this.drugTypeList = response.data.data.drugTypeList
            for(let i=0;i<list.length;i++){
              list[i].child = []
@@ -356,15 +360,21 @@ export default {
                   list[i].child.push(order[j])
                }
             }
+            list[i].manufacturer_name = this.getManufacturerName(list[i].manufacturer)
+            list[i].dealer_name = this.getDealerName(list[i].dealer)
            }
            this.tableDataList = list
+           console.log("数据我我我",this.tableDataList)
            var total_price = 0
           for(let i=0;i<order.length;i++){
              order[i].specification_name  = order[i].dose + order[i].dose_unit + "*" + order[i].min_number +  order[i].min_unit + "/" + order[i].max_unit
              order[i].is_total = 0
              order[i].total_price = order[i].count * order[i].price
              total_price += order[i].count * order[i].price
+             order[i].manufacturer_name = this.getManufacturerName(order[i].manufacturer)
+             order[i].dealer_name = this.getDealerName(order[i].dealer)
           }
+
            order.push({
             order_number: "合计",
             is_total: 1,
@@ -380,7 +390,24 @@ export default {
          }
       })
     },
-
+    getManufacturerName(id){
+        var manufacturer_name = ""
+        for(let i=0;i<this.manufacturerList.length;i++){
+          if(id == this.manufacturerList[i].id){
+            manufacturer_name = this.manufacturerList[i].manufacturer_name
+          }
+        }
+        return manufacturer_name
+     },
+     getDealerName(id){
+       var dealer_name = ""
+       for(let i=0;i<this.dealerList.length;i++){
+          if(id == this.dealerList[i].id){
+              dealer_name = this.dealerList[i].dealer_name
+          }
+       }
+       return dealer_name
+     }, 
      getAdminUser(id){
       var name = ""
       for(let i=0;i<this.adminUserOptions.length;i++){
@@ -418,8 +445,8 @@ export default {
           this.tableDataList[i].ctime = this.getTime(this.tableDataList[i].ctime)
         }
        import('@/vendor/Export2Excel').then(excel => {
-        const tHeader = ['序号','单据编号', '药品名称', '规格型号','单据类型','操作时间','制单人','数量','退库价','总价']
-        const filterVal = ['index','order_number','drug_name', 'specification_name', 'drug_type','ctime','user_name','total_count','price','total_price']
+        const tHeader = ['序号','单据编号', '药品名称', '规格型号','生产厂商','进销商','单据类型','操作时间','制单人','数量','退库价','总价']
+        const filterVal = ['index','order_number','drug_name', 'specification_name','manufacturer_name','dealer_name', 'drug_type','ctime','user_name','total_count','price','total_price']
 
         const data = this.formatJson(filterVal, this.tableDataList)
 
@@ -436,8 +463,8 @@ export default {
      },
     exportListOne(){
       // let obj = {'index':'合计','total_price':0}
-      console.log("@332322323232332",this.tableList)
-
+    
+ 
        for(let i=0;i<this.tableList.length;i++){
           this.tableList[i].index = i+1
           this.tableList[i].unit = this.tableList[i].dose + this.tableList[i].dose_unit + "*"+this.tableList[i].min_number + this.tableList[i].min_unit+"/"+this.tableList[i].max_unit
@@ -453,17 +480,13 @@ export default {
           this.tableList[i].time = this.getTime(this.tableList[i].ctime)
           this.tableList[i].user_name = this.getAdminUser(this.tableList[i].creater)
 
-          //this.tableList[i].total_price = this.tableList[i].count * this.tableList[i].price
-          //  obj.total_price += this.tableList[i].count * this.tableList[i].price
         }
-      //   obj.total_price = obj.total_price.toFixed(2)
-      //  this.tableList.push(obj)
-      //  for(let i=0;i<this.tableData.length;i++){
-      //    this.tableData[i].total_price = (this.tableData[i].total_price).toFixed(2)
-      //  }
+    
+      console.log("@332322323232332",this.tableList)
+      
        import('@/vendor/Export2Excel').then(excel => {
-       const tHeader = ['序号','单据编号', '药品类型','药品名称', '规格型号','操作时间','制单人','退货价','数量','总价']
-       const filterVal = ['index','order_number','drugtype','drug_name', 'specification_name', 'time','user_name','price','count','total_price']
+       const tHeader = ['序号','单据编号', '药品类型','药品名称', '规格型号','生产厂商','进销商','操作时间','制单人','退货价','数量','总价']
+       const filterVal = ['index','order_number','drugtype','drug_name', 'specification_name','manufacturer_name','dealer_name', 'time','user_name','price','count','total_price']
 
        const data = this.formatJson(filterVal, this.tableList)
 

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

@@ -449,6 +449,8 @@ export default {
             var list = response.data.data.list
           
             this.tabelePrintList = list
+            this.manufacturerList = response.data.data.manufacturerList
+            this.dealerList = response.data.data.dealerList
           }   
       })
     },
@@ -470,17 +472,19 @@ export default {
       return name
     },
      exportList(){
-       
+        
+       console.log("tablePrintlist",this.tabelePrintList)
+      
         for(let i=0;i<this.tabelePrintList.length;i++){
           this.tabelePrintList[i].index = i+1
           this.tabelePrintList[i].drug_name = this.tabelePrintList[i].XtBaseDrug.drug_name
-
+          this.tabelePrintList[i].manufacturer_name = this.getManufacturerName(this.tabelePrintList[i].manufacturer)
+          this.tabelePrintList[i].dealer_name = this.getDealerName(this.tabelePrintList[i].dealer)
           this.tabelePrintList[i].unit = this.tabelePrintList[i].XtBaseDrug.dose + this.tabelePrintList[i].XtBaseDrug.dose_unit + "*" + this.tabelePrintList[i].XtBaseDrug.min_number +this.tabelePrintList[i].XtBaseDrug.min_unit +"/"+this.tabelePrintList[i].XtBaseDrug.max_unit
         }
-        
        import('@/vendor/Export2Excel').then(excel => {
-       const tHeader = ['序号','药品名称', '规格型号', '单位','数量','单价','总价','备注']
-       const filterVal = ['index','drug_name', 'unit', 'max_unit','warehousing_count','price','total_price','remark']
+       const tHeader = ['序号','药品名称', '规格型号','生产厂商','经销商', '单位','数量','单价','总价','备注']
+       const filterVal = ['index','drug_name', 'unit','manufacturer_name','dealer_name', 'max_unit','warehousing_count','price','total_price','remark']
        let obj = {'index':'合计','total_price':0}
        for(let i=0;i<this.tabelePrintList.length;i++){
          obj.total_price += this.tabelePrintList[i].price * this.tabelePrintList[i].warehousing_count
@@ -503,21 +507,42 @@ export default {
      formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]));
      },
+     getManufacturerName(id){
+        var manufacturer_name = ""
+        for(let i=0;i<this.manufacturerList.length;i++){
+          if(id == this.manufacturerList[i].id){
+            manufacturer_name = this.manufacturerList[i].manufacturer_name
+          }
+        }
+        return manufacturer_name
+     },
+     getDealerName(id){
+       var dealer_name = ""
+       for(let i=0;i<this.dealerList.length;i++){
+          if(id == this.dealerList[i].id){
+              dealer_name = this.dealerList[i].dealer_name
+          }
+       }
+       return dealer_name
+     }, 
      exportListDetail(){
        
        import('@/vendor/Export2Excel').then(excel => {
-       const tHeader = ['序号','单据编号', '药品类型', '药品名称','规格型号','操作时间','制单人','进货价','数量','总价']
-       const filterVal = ['index','warehousing_order','drugtype','drug_name', 'specification_name','time','user_name','price','warehousing_count','total']
+       const tHeader = ['序号','单据编号', '药品类型', '药品名称','规格型号','生产厂商','进销商','操作时间','制单人','进货价','数量','总价']
+       const filterVal = ['index','warehousing_order','drugtype','drug_name', 'specification_name','manufacturer_name','dealer_name','time','user_name','price','warehousing_count','total']
 
        var newArr = []
        newArr = this.cancelStockDate
+       console.log("newArrwowowowoow",newArr)
+     
        let obj = {'index':'合计','total':0}
        for(let i=0;i<newArr.length;i++){
           newArr.specification_name = ""
           newArr.index = i+1
          newArr[i].drugtype = this.getTypeList(newArr[i].drug_type)
          newArr[i].specification_name = newArr[i].dose + newArr[i].dose_unit +"*" + newArr[i].min_number + newArr[i].min_unit +  "/" + newArr[i].max_unit
-
+         newArr[i].manufacturer_name = this.getManufacturerName(newArr[i].manufacturer)
+         newArr[i].dealer_name = this.getDealerName(newArr[i].dealer)
          newArr[i].time = this.getTime(newArr[i].ctime)
          newArr[i].user_name = this.getAdminUser(newArr[i].creater)
          newArr[i].total = (newArr[i].price * newArr[i].warehousing_count).toFixed(2)

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

@@ -122,6 +122,12 @@
           </template>
         </el-table-column>
 
+        <el-table-column label="生产厂商" align="center">
+          <template slot-scope="scope">
+           {{getManufacturerName(scope.row.manufacturer)}}
+          </template>
+        </el-table-column>
+
 
         <el-table-column label="操作时间" align="center">
           <template slot-scope="scope">
@@ -274,6 +280,8 @@ export default {
       drugTypeList:[],
       storehouse_id:0,
       houseList:[],
+      dealerList:[],
+      manufacturerList:[]
     };
   },
   methods: {
@@ -576,6 +584,8 @@ export default {
         for(let i=0;i<this.tablePrint.length;i++){
           this.tablePrint[i].index = i+1
           this.tablePrint[i].ctime = this.getTime(this.tablePrint[i].ctime)
+          this.tablePrint[i].manufacturer_name = this.getManufacturerName(this.tablePrint[i].manufacturer)
+          this.tablePrint[i].dealer_name = this.getDealerName(this.tablePrint[i].dealer)
         }
         for(let i=0;i<this.tablePrint.length;i++){
            if(this.org_id == 9919 || this.org_id == 9671){
@@ -594,8 +604,8 @@ export default {
 
 
        import('@/vendor/Export2Excel').then(excel => {
-       const tHeader = ['序号','药品名称', '规格型号', '单位','数量','单价','总价','出库时间','备注']
-       const filterVal = ['index','drug_name', 'unit', 'min_unit','count','min_price','total_price','ctime','remark']
+       const tHeader = ['序号','药品名称', '规格型号','生产厂商','进销商', '单位','数量','单价','总价','出库时间','备注']
+       const filterVal = ['index','drug_name', 'unit', 'manufacturer_name','dealer_name','min_unit','count','min_price','total_price','ctime','remark']
        let obj = {'index':'合计','total_price':0.00}
        for(let i=0;i<this.tablePrint.length;i++){
          obj.total_price += this.tablePrint[i].total
@@ -619,8 +629,8 @@ export default {
      },
     exportListDetai(){
       import('@/vendor/Export2Excel').then(excel => {
-       const tHeader = ['序号','单据编号', '药品类型', '药品名称','规格型号','操作时间','制单人','出货价','数量','总价']
-       const filterVal = ['index','warehouse_out_order_number', 'drugtype', 'drug_name','specification_name','time','user_name','price','count','total_price']
+       const tHeader = ['序号','单据编号', '药品类型', '药品名称','规格型号','生产厂商','进销商','操作时间','制单人','出货价','数量','总价']
+       const filterVal = ['index','warehouse_out_order_number', 'drugtype', 'drug_name','specification_name','manufacturer_name','dealer_name','time','user_name','price','count','total_price']
        for(let i=0;i<this.tableData.length;i++){
          if(this.tableData[i].is_total == 0){
             this.tableData[i].index = i+1
@@ -633,10 +643,11 @@ export default {
             if(this.tableData[i].drug_type == 3){
               this.tableData[i].drugtype = "成药"
             }
-            // this.tableData[i].drugtype = this.getTypeList(this.tableData[i].drugtype)
             this.tableData[i].specification_name = this.tableData[i].dose + this.tableData[i].dose_unit +"*" + this.tableData[i].min_number + this.tableData[i].min_unit +  "/" + this.tableData[i].max_unit
             this.tableData[i].time = this.getTime(this.tableData[i].ctime)
             this.tableData[i].user_name = this.getAdminUser(this.tableData[i].creater)
+            this.tableData[i].manufacturer_name = this.getManufacturerName(this.tableData[i].manufacturer)
+            this.tableData[i].dealer_name = this.getDealerName(this.tableData[i].dealer)
             if(this.org_id == 9919){
               this.tableData[i].total = (this.tableData[i].count * this.tableData[i].last_price)
               if(this.tableData[i].count >=this.tableData[i].min_number){
@@ -670,7 +681,24 @@ export default {
           this.downloadLoading = false
       })
     },
-
+    getManufacturerName(id){
+        var manufacturer_name = ""
+        for(let i=0;i<this.manufacturerList.length;i++){
+          if(id == this.manufacturerList[i].id){
+            manufacturer_name = this.manufacturerList[i].manufacturer_name
+          }
+        }
+        return manufacturer_name
+     },
+     getDealerName(id){
+       var dealer_name = ""
+       for(let i=0;i<this.dealerList.length;i++){
+          if(id == this.dealerList[i].id){
+              dealer_name = this.dealerList[i].dealer_name
+          }
+       }
+       return dealer_name
+     }, 
     getBaseDrugLibList() {
         let params = {
           page: 1,
@@ -704,7 +732,8 @@ export default {
      getDrugOutOrderPrint(params).then(response=>{
         if(response.data.state == 1){
             var list = response.data.data.list
-         
+            this.dealerList = response.data.data.dealerList
+            this.manufacturerList = response.data.data.manufacturerList
             let objInfo = {}
             if(this.org_id == 9919){
               list.forEach((item,index)=>{
@@ -726,6 +755,8 @@ export default {
                   max_unit:item.XtBaseDrug.max_unit,
                   min_price:item.XtBaseDrug.min_price,
                   ctime:item.ctime,
+                  manufacturer:item.manufacturer,
+                  dealer:item.dealer,
                 }
               }
              })
@@ -749,6 +780,8 @@ export default {
                   max_unit:item.XtBaseDrug.max_unit,
                   min_price:item.XtBaseDrug.min_price,
                   ctime:item.ctime,
+                  manufacturer:item.manufacturer,
+                  dealer:item.dealer,
                 }
               }
             })

src/xt_pages/stock/drugs/inventoryDetails.vue

@@ -158,6 +158,10 @@ export default {
             this.$router.push({path:'/stock/drugs/inventoryPrint'}) 
         },
         print_1(){
+           if(this.ids == ""){
+             this.$message.error("请勾选需要打印的内容")
+             return false
+           }
            this.$router.push({path:'/stock/drugs/print?storehouse_id='+this.storehouse_id+"&drug_name="+this.searchKey+"&limit="+this.limit+"&page="+this.page+"&ids="+this.ids}) 
         },
         handleSizeChange(val){

src/xt_pages/stock/inventoryDetails.vue

@@ -145,6 +145,10 @@ export default {
     },
     methods:{
         toprint(){
+          if(this.ids == ""){
+             this.$message.error("请勾选需要打印的内容")
+             return false
+          }              
           this.$router.push({path:'/stock/print_all?storehouse_id='+this.storehouse_id+"&good_name="+this.searchKey+"&limit="+this.limit+"&page="+this.page+"&ids="+this.ids})
         },