1

src/xt_pages/stock/drugs/drugStockInOrderDetailPrint.vue

@@ -15,42 +15,52 @@
           <table class="print-table" border="1">
             <tbody>
             <tr>
-              <td style="line-height: 50px" width="50">序号</td>
-              <td style="line-height: 50px" width="250">药品名称</td>
-              <td style="line-height: 50px" width="250">规格型号</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 width="80">药品名称</td>
+              <td width="80">注册证号/批准文号/备案凭证号</td>
+              <td width="80">规格型号</td>
+              <td width="80">生产厂商</td>
+              <td width="80">单位</td>
+              <td width="80">进货价</td>
+              <td width="80">入库数量</td> 
+              <td width="80">总价</td>
+              <td width="80">批号</td>
+              <td width="80">生产日期</td>
+              <td width="80">有效日期</td>
+              <td width="80">质检意见</td>
+              <td width="80">验收结论</td>
             </tr>
 
             <tr v-for="(item,index) in WarehouseInfo.warehouseInfoDate" :key="item.id">
-              <td style="line-height: 50px">&nbsp;
-                {{index+1}}
-              </td>
               <td style="line-height: 50px">
                  <span v-if="item.drug_id != 0">{{item.drug.drug_name}}</span>
               </td>
+              <td>{{ item.remark }}</td>
               <td style="line-height: 50px">
                  <span v-if="item.drug_id != 0">{{item.drug?item.drug.drug_spec:''}}</span>
               </td>
+              <td>{{ getManufacturer(item.manufacturer) }}</td>
               <td style="line-height: 50px">
                 <span>{{getUnit(item.drug_id)}}</span>
               </td>
-            
+              <td style="line-height:50px">
+                  {{item.price}}
+              </td>
               <td style="line-height: 50px">
                    <span>{{ item.warehousing_count }}</span>
               </td>
+              
               <td style="line-height:50px">
-                  {{item.price}}
+                  <span>{{(item.warehousing_count * item.price).toFixed(2)}}</span>
               </td>
-             <td style="line-height:50px">
-                <span>{{(item.warehousing_count * item.price).toFixed(2)}}</span>
-             </td>
+              <td>{{ item.number }}</td>
+              <td>{{ item.product_date | parseTime("{y}-{m}-{d}") }}</td>
+              <td>{{ item.expiry_date | parseTime("{y}-{m}-{d}") }}</td>
+              <td>正常入库</td>
+              <td>合格</td>
             </tr>
             <tr>
               <td>合计</td>
-              <td colspan="5"></td>
+              <td colspan="11"></td>
               <td>{{allPrice.toFixed(2)}}</td>
             </tr>
             </tbody>
@@ -74,7 +84,7 @@
 </template>
 
 <script>
-  import { getPrintStockGood } from '@/api/stock'
+  import { GetAllConfig,getPrintStockGood } from '@/api/stock'
   import { getDataConfig } from '@/utils/data'
   import { jsGetAge, uParseTime } from '@/utils/tools'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
@@ -217,11 +227,32 @@
         }
         return name
       },
+      getManufacturer(id){
+        let name = ''
+        this.manufacturer.map(item => {
+          if(item.id == id){
+            name = item.manufacturer_name
+          }
+        })
+        return name
+      },
+      GetConfigInfo: function() {
+        GetAllConfig().then(response => {
+            if (response.data.state == 0) {
+            this.$message.error(response.data.msg);
+            return false;
+            } else {
+            this.manufacturer = response.data.data.manufacturer;
+            }
+        });
+      },
     },
     created() {
+      this.GetConfigInfo()
       const order_id = this.$route.query.id;
       this.GetOrderDetail(order_id);
       this.getList()
+      
     }
 
   }

src/xt_pages/stock/stockInOrderDetailPrint.vue

@@ -26,7 +26,7 @@
                                     <td width="80">规格型号</td>
                                     <td width="80">生产厂商</td>
                                     <td width="80">单位</td>
-                                     <td width="80">进货价</td>
+                                    <td width="80">进货价</td>
                                     <td width="80">入库数量</td> 
                                     <td width="80">总价</td>
                                     <td width="80">批号</td>
@@ -39,7 +39,7 @@
                             <tbody>
                                 <tr v-for='(item,index) in WarehouseInfo.warehouseInfoDate' :key="index">
                                     <td><span v-if="item.good_id != 0">{{getTypeNameOne(item.good_id)}}</span></td>
-                                    <td></td>
+                                    <td>{{ item.remark }}</td>
                                     <td><span v-if="item.good_id != 0">{{getSpecificationName(item.good_id)}}</span></td>
                                     <td>{{ getManufacturer(item.manufacturer) }}</td>
                                     <td><span v-if="item.good_id!=0">{{getUnit(item.good_id)}}</span></td>
@@ -49,8 +49,8 @@
                                     <td>{{ item.number }}</td>
                                     <td>{{ item.product_date | parseTime("{y}-{m}-{d}") }}</td>
                                     <td>{{ item.expiry_date | parseTime("{y}-{m}-{d}") }}</td>
-                                    <td></td>
-                                    <td></td>
+                                    <td>正常入库</td>
+                                    <td>合格</td>
                                 </tr>
                                 <tr>
                                   <td>合计</td>