refactor(print-template): 更新嘉实发货单出库单打印模板

src/views/saleManage/saleOrder/invoice/components/print-template-js.vue

@@ -27,7 +27,7 @@
           >{{ groupName || '嘉实（湖南）医院科技有限公司' }}出库单</div
         >
         <div style="text-align: center"
-          >（文件编号：JS/SPM-GY-005-01(A/O)）</div
+          >（文件编号：JS/SPM-GY-005-01(A/2)）</div
         >
       </div>
       <div
@@ -39,11 +39,53 @@
           margin-bottom: 10px;
         "
       >
-        <span style="width: 70%">客户地址：{{ formData.receiveAddress }}</span>
+        <span style="width: 70%"></span>
         <span style="width: 30%"
           >NO.：{{ formData.printNo || formData.docNo }}</span
         >
       </div>
+      <div
+        style="
+          width: 100%;
+          font-size: 12px;
+          display: flex;
+          justify-content: space-between;
+          margin-bottom: 10px;
+        "
+      >
+        <span style="width: 30%">注册人：{{ this.groupName || '嘉实（湖南）医院科技有限公司' }}</span>
+        <span style="width: 40%">地址：长沙高新开发区汇智中路179号金导园C区8栋</span>
+        <span style="width: 30%"
+          >电话：0731-84221288</span
+        >
+      </div>
+      <div
+        style="
+          width: 100%;
+          font-size: 12px;
+          display: flex;
+          justify-content: space-between;
+          margin-bottom: 10px;
+        "
+      >
+        <span style="width: 30%">生产企业/受托生产企业：</span>
+        <span style="width: 40%">生产地址：</span>
+        <span style="width: 30%"
+          >收货地址：{{ formData.receiveAddress }}</span
+        >
+      </div>
+      <div
+        style="
+          width: 100%;
+          font-size: 12px;
+          display: flex;
+          justify-content: space-between;
+          margin-bottom: 10px;
+        "
+      >
+        <span style="width: 30%">购货单位：{{ formData.contactName }}</span>
+        <span style="width: 40%">收货人：{{ formData.linkName }}</span>
+      </div>
       <table
         cellspacing="0"
         border
@@ -58,13 +100,15 @@
         <tbody>
           <tr align="center">
             <td style="padding: 5px"> 编号 </td>
-            <td style="padding: 5px"> 商品名称 </td>
-            <td style="padding: 5px"> 规格/型号 </td>
-            <td style="padding: 5px"> 生产厂家</td>
+            <td style="padding: 5px"> 名称 </td>
+            <td style="padding: 5px"> 型号 </td>
+            <td style="padding: 5px"> 注册证号 </td>
             <td style="padding: 5px"> 数量</td>
-            <td style="padding: 5px"> 单位</td>
             <td style="padding: 5px"> 批号</td>
             <td style="padding: 5px"> 序列号</td>
+            <td style="padding: 5px"> 生产日期</td>
+            <td style="padding: 5px"> 有效期</td>
+            <td style="padding: 5px"> 储运条件</td>
             <td style="padding: 5px"> 备注</td>
           </tr>
 
@@ -75,19 +119,19 @@
             <td style="padding: 5px"> {{ index + 1 }} </td>
             <td style="padding: 5px"> {{ item.categoryName }} </td>
             <td style="padding: 5px">
-              {{ item.specification }}/{{ item.categoryModel }}
+              {{ item.categoryModel }}
             </td>
-            <td style="padding: 5px">
-              {{groupName || '嘉实（湖南）医院科技有限公司' }}</td
-            >
+            <td style="padding: 5px"></td>
             <td style="padding: 5px"> {{ item.measureQuantity }}</td>
-            <td style="padding: 5px"> {{ item.measureUnit }}</td>
             <td style="padding: 5px"> {{ item.batchNo }}</td>
             <td style="padding: 5px"> {{ item.serialNumber }}</td>
-            <td style="padding: 5px"> {{ item.engrave }}</td>
+            <td style="padding: 5px"> {{ item.detailProductionDate }}</td>
+            <td style="padding: 5px"> {{ item.detailExpireDate }}</td>
+            <td style="padding: 5px"> {{ item.extField?.layBy || '' }}</td>
+            <td style="padding: 5px"> {{ item.engrave || '' }}</td>
           </tr>
           <tr>
-            <td style="padding: 5px" colspan="9">
+            <td style="padding: 5px" colspan="11">
               备注: &nbsp;白色仓库联&nbsp;&nbsp;&nbsp;
               红色客户联&nbsp;&nbsp;&nbsp; 黄色财务联</td
             >
@@ -104,15 +148,16 @@
         "
       >
         <div style="flex: 1">
-          <div>编单人/日期：{{ formData.makerName }}</div>
-          <div>{{ formData.createTime }}</div>
+          <div>编单人：{{ formData.makerName }}</div>
+          <!-- <div>{{ formData.createTime }}</div> -->
         </div>
         <div style="flex: 1">
-          <div>审核人/日期：{{ outBound.createTime }}</div>
-          <div>{{ outBound.extInfo?.createUserName }}</div>
+          <div>审核人：{{ outBound.extInfo?.createUserName }}</div>
+          <!-- <div>{{ outBound.createTime }}</div> -->
         </div>
         <div style="flex: 1">
-          收货人:{{ formData.linkName }} {{ formData.linkPhone }}
+          <!-- 收货人:{{ formData.linkName }} {{ formData.linkPhone }} -->
+          发货日期：{{ outBound.createTime?.split(' ')[0] }}
         </div>
       </div>
     </div>

src/views/saleManage/saleOrder/invoice/components/print-template-jsyp.vue

@@ -37,7 +37,7 @@
           margin-top: 10px;
         "
       >
-        <span style="width: 39%">制单日期：{{ formData.createTime?.split(' ')[0] }}</span>
+        <span style="width: 39%">销售日期：{{ formData.createTime?.split(' ')[0] }}</span>
         <span style="width: 39%">发货日期：{{ outBound.createTime?.split(' ')[0] }}</span>
         <span style="width: 22%"
           >出库单号：{{ formData.printNo || outBound.bizNo }}</span
@@ -88,6 +88,19 @@
         <span style="width: 39%">收货地址：{{ formData.receiveAddress }}</span>
         <span style="width: 22%"></span>
       </div>
+      <div
+        style="
+          width: 100%;
+          font-size: 12px;
+          display: flex;
+          justify-content: space-between;
+          margin-bottom: 10px;
+        "
+      >
+        <span style="width: 39%">收货人：{{ formData.linkName }}</span>
+        <span style="width: 39%">电话：{{ formData.linkPhone }}</span>
+        <span style="width: 22%"></span>
+      </div>
       <table
         cellspacing="0"
         border
@@ -155,10 +168,10 @@
           margin-top: 10px;
         "
       >
-        <div style="flex: 1"> 开票员： </div>
-        <div style="flex: 1"> 保管员： </div>
+        <div style="flex: 1"> 制单人：{{ formData.makerName }} </div>
+        <!-- <div style="flex: 1"> 保管员： </div> -->
         <div style="flex: 1"> 复核: </div>
-        <div style="flex: 1"> 发货员: </div>
+        <div style="flex: 1"> 收货人签字（物流自提/送货上门）: </div>
       </div>
       <div
         style="
@@ -173,7 +186,8 @@
         <div style="flex: 1"> 白联:开票留存 </div>
         <div style="flex: 1"> 红联:仓库留存 </div>
         <div style="flex: 1"> 蓝联:财务留存 </div>
-        <div style="flex: 1"> 绿联/黄联:随货同行 </div>
+        <div style="flex: 1"> 绿联:承运单位留存 </div>
+        <div style="flex: 1"> 黄联:随货同行 </div>
       </div>
     </div>