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

src/xt_pages/stock/detail/stockInDetail.vue

       dealerList:[],
       currentIndex:0,
       good_id:0,
+      goodKindList:[]
     };
   },
   methods: {
+    getGoodKandName(id){
+     
+      var name = ""
+      for(let i=0;i<this.goodKindList.length;i++){
+       if(id == this.goodKindList[i].value){
+          name = this.goodKindList[i].name
+       }
+      }
+      return name
+    },
     handleSelect(val){
      this.good_name = val.good_name
      this.good_id = val.id
           this.tableDataList = response.data.data.list
           this.manufacturerList = response.data.data.manufacturerList
           this.dealerList = response.data.data.dealerList
-        
+          
+          this.goodKindList = response.data.data.goodKindList
 
           this.cancelStockDate.push({
             warehousing_order: "合计",
         var obj = {index:"合计",total_price:0}
         var total = 0
         console.log("wowowows",this.tableDataList)
-        return
+       
         for(let i=0;i<this.tableDataList.length;i++){
+          this.tableDataList[i].good_kand_name = this.getGoodKandName(this.tableDataList[i].GoodInfo.good_kind)
           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)
         obj.total_price = total.toFixed(2)
         this.tableDataList.push(obj)
       
+        console.log("hhhhhhhhhhhhhhhh",this.tableDataList)
+       
         import('@/vendor/Export2Excel').then(excel => {
-        const tHeader = ['序号','单据编号', '耗材类型', '耗材名称','规格型号','生产厂商','进销商','批号','生产日期','有效日期','操作时间','制单人','进货价','数量','总价']
-        const filterVal = ['index','warehousing_order', 'good_type_name', 'good_name','specification_name','manufacturer_name','dealer_name','number','product_date_name','expiry_date_name','time','user_name','price','warehousing_count','total_price']
+        const tHeader = ['序号','单据编号','耗材种类', '耗材类型', '耗材名称','规格型号','生产厂商','进销商','批号','生产日期','有效日期','操作时间','制单人','进货价','数量','总价']
+        const filterVal = ['index','warehousing_order','good_kand_name', 'good_type_name', 'good_name','specification_name','manufacturer_name','dealer_name','number','product_date_name','expiry_date_name','time','user_name','price','warehousing_count','total_price']
 
 
         const data = this.formatJson(filterVal, this.tableDataList)

src/xt_pages/stock/detail/stockOutDetail.vue

       patientsList:[],
       good_id:0,
       good_name:"",
+      goodKindList:[]
     };
   },
   methods: {
+    getGoodKandName(id){
+     
+     var name = ""
+     for(let i=0;i<this.goodKindList.length;i++){
+      if(id == this.goodKindList[i].value){
+         name = this.goodKindList[i].name
+      }
+     }
+     return name
+   },
     changeOrderWayList(){
       this.GetCancelStock();
       this.getGoodDetailPrintList()
           this.tableDataList = response.data.data.list
           this.manufacturerList = response.data.data.manufacturerList
           this.dealerList = response.data.data.dealerList
-
+          this.goodKindList = response.data.data.goodKindList
           this.cancelStockDate.push(objOne);
 
         }
      },
      exportListDetail(){
         console.log("hahhdhafhhahdf",this.tableDataList)
-
+       
         var obj = {index:"合计",total_price:0}
         var total = 0
         for(let i=0;i<this.tableDataList.length;i++){
+          this.tableDataList[i].good_kand_name = this.getGoodKandName(this.tableDataList[i].GoodInfo.good_kind)
           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.push(obj)
        import('@/vendor/Export2Excel').then(excel => {
-       const tHeader = ['序号','单据编号', '耗材类型', '耗材名称','规格型号','生产厂商','进销商','批号','生产日期','有效日期','操作时间','制单人','进货价','出货价','使用患者','数量','总价']
-       const filterVal = ['index','warehouse_out_order_number', 'good_type_name', 'good_name','specification_name','manufacturer_name','dealer_name','number','product_date_name','expiry_date_name','time','user_name','in_price','price','patient_name','out_count','total_price']
+       const tHeader = ['序号','单据编号','耗材种类', '耗材类型', '耗材名称','规格型号','生产厂商','进销商','批号','生产日期','有效日期','操作时间','制单人','进货价','出货价','使用患者','数量','总价']
+       const filterVal = ['index','warehouse_out_order_number','good_kand_name','good_type_name', 'good_name','specification_name','manufacturer_name','dealer_name','number','product_date_name','expiry_date_name','time','user_name','in_price','price','patient_name','out_count','total_price']
 
        const data = this.formatJson(filterVal, this.tableDataList)