518合并代码

src/xt_pages/stock/drugs/drugStockOutOrderDetailPrint.vue

@@ -13,8 +13,8 @@
 
           <div style="float: left;margin-bottom: 1px;">单据编号：{{it.warehouse_out_order_number}}</div>
           <div style="float: right;margin-bottom: 1px;">{{getDateTwo()}}</div>
-         
-           <table class="print-table" border="1" v-if = "orgId != 10210">
+
+          <table class="print-table" border="1">
             <tbody>
             <tr>
               <td style="line-height: 50px" width="230">药品名称</td>
@@ -58,50 +58,6 @@
              </tr>
             </tbody>
           </table>
-          <table class="print-table" border="1" v-if = "orgId ==10210">
-            <tbody>
-            <tr>
-              <td style="line-height: 50px" width="230">药品名称</td>
-              <td style="line-height: 50px" width="230">规格型号</td>
-              <td style="line-height: 50px" width="80">出货数量</td>
-              <td style="line-height: 50px" width="50">单位</td>
-              <td style="line-height:50px" width="80">出库价格</td>
-              <td style="line-height: 50px" width="80">总价</td>
-              <td style="line-height: 50px" width="80">批号</td>
-              <td style="line-height: 50px" width="80">生产日期</td>
-              <td style="line-height: 50px" width="80">有效日期</td>
-            </tr>
-
-            <tr v-for="(item,i) in tableData" :key="i">
-              <td style="line-height: 50px">
-                <span>{{item.drug.drug_name}}</span>
-              </td>
-              <td style="line-height: 50px">
-                <span>{{item.drug.dose}}{{item.drug.dose_unit}}*{{item.drug.min_number}}{{item.drug.min_unit}}/{{item.drug.max_unit}}</span>
-              </td>
-              <td style="line-height: 50px">
-                  {{item.count}}
-              </td>
-              <td style="line-height: 50px">
-                <span>{{item.count_unit}}</span>
-              </td>
-              <td style="line-height:50px">
-                  {{item.price}}
-              </td>
-             <td  style="line-height:50px">
-                {{(item.count * item.price).toFixed(2)}}
-             </td>
-             <td>{{item.batch_number}}</td>
-             <td>{{(getTime(item.product_date))}}</td>
-             <td>{{(getTime(item.expire_date))}}</td>
-            </tr>
-             <tr>
-               <td style="line-height:50px">合计</td>
-               <td colspan="7"></td>
-               <td>{{getTotalPrice()}} </td>
-             </tr>
-            </tbody>
-          </table>
 
 
           <div v-if="orgId != 10024" style="display:flex;margin-top:1px;float:right;">
@@ -177,9 +133,7 @@
         manufactureList:[],
         tableList:[],
         loading:false,
-        warehouseList:[],
-        orgId:0,
-        tableData:[],
+        warehouseList:[]
       }
     },
     methods: {
@@ -361,7 +315,9 @@
         getDrugOutOrderDetailPrint(params).then(response=>{
           if(response.data.state ==1){
              var info = response.data.data.info
+             console.log("info",info)
             var warehousing = response.data.data.warehousing
+            console.log("ware2232",warehousing)
             this.warehouseList = warehousing
           
             for(let i=0;i<info.length;i++){
@@ -374,18 +330,15 @@
             }
             
             var manufacturerList = response.data.data.manufacturerList
+            console.log("manufacturelist",manufacturerList)
             this.manufactureList = manufacturerList
+            console.log("列表",info)
             this.tableList = info
-
-            var drug_warhouse_out = response.data.data.drug_warhouse_out
-            this.tableData = drug_warhouse_out
             this.loading = false
-
-           
           }
         })
       },
-      getAllPrince(){
+      getAllPrince(id){
         var count = 0
         for(let i=0;i<this.warehouseList.length;i++){
           if(id == this.warehouseList[i].warehouse_out_id){
@@ -393,15 +346,6 @@
           }
         }
         return count
-      },
-      getTotalPrice(){
-         var count = 0
-        for(let i=0;i<this.tableList.length;i++){
-          if(id == this.tableList[i].warehouse_out_id){
-             count +=this.tableList[i].count * this.tableList[i].price
-          }
-        }
-        return count.toFixed(2)
       }
     },
     created() {