luobang 2 tahun lalu
induk
melakukan
14886fea39

+ 2 - 2
build/utils.js

@@ -16,9 +16,9 @@ const devPathSrc = path.resolve(__dirname, '../../../src') // node_modules应用
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow','ADMINISTRATORS']
 
-// let devModules = ['all']
-// let devModules = ['index', 'statisticalReport', 'sale']
 let devModules = ['all']
+// let devModules = ['index', 'statisticalReport', 'sale']
+// let devModules = ['all']
 
 // let devModules = ['index', 'ADMINISTRATORS']
 

+ 16 - 12
src/views/index/components/printReceipt.vue

@@ -51,10 +51,12 @@
           >
             <tr style="height: 35px">
               <th style="width: 5%; text-align: center">序号</th>
-              <th style="width: 23.5%; text-align: center">物资名称</th>
-              <th style="width: 22.5%; text-align: center">规格型号</th>
-              <th style="width: 14%">件数</th>
-              <th style="width: 35%">重量</th>
+              <th style="width: 22.5%; text-align: center">物资名称</th>
+              <th style="width: 17.5%; text-align: center">规格型号</th>
+              <th style="width: 5%">件数</th>
+              <th style="width: 6%">重量</th>
+              <th style="width: 20%">过磅时间</th>
+              <th style="width: 24%">摘要</th>
               <!--              <th style="width: 21%">订单日期</th>-->
             </tr>
             <tr
@@ -67,6 +69,8 @@
               <td>{{ item.materialSpe }}{{ item.materialModel }}</td>
               <td>{{ item.materialNumber }}</td>
               <td>{{ item.materialWeight }}</td>
+              <td>{{ item.netWeightTime }}</td>
+              <td>{{ item.saleRemark }}</td>
               <!--              <td>{{ item.makeDate }}</td>-->
             </tr>
           </table>
@@ -81,8 +85,8 @@
             class="tablePart2"
           >
             <tr>
-              <th style="width: 28.5%">收货地点</th>
-              <td style="width: 71.5%">
+              <th style="width: 27.5%">收货地点</th>
+              <td style="width: 72.5%">
                 {{ province }}{{ district }}{{ town }}{{ deliveryAddress }}
               </td>
             </tr>
@@ -98,8 +102,8 @@
             class="tablePart3"
           >
             <tr>
-              <th style="width: 28.5%">收货人</th>
-              <td style="width: 22.5%">{{ consignee }}</td>
+              <th style="width: 27.5%">收货人</th>
+              <td style="width: 23.5%">{{ consignee }}</td>
               <th style="width: 14%">电话</th>
               <td style="width: 35%">{{ consigneeTel }}</td>
             </tr>
@@ -115,15 +119,15 @@
             class="tablePart4"
           >
             <tr>
-              <th style="width: 28.5%">承运商</th>
-              <td style="width: 36.5%">{{ carrierName }}</td>
+              <th style="width: 27.5%">承运商</th>
+              <td style="width: 37.5%">{{ carrierName }}</td>
               <th style="width: 14%">车牌号</th>
               <td style="width: 35%">{{ capacityNumber }}</td>
             </tr>
           </table>
 
           <!-- tablePart9 -->
-          <table
+          <!-- <table
             border="1"
             cellpadding="10"
             cellspacing="0"
@@ -135,7 +139,7 @@
               <th style="width: 28.5%">备注</th>
               <td style="width: 71.5%">{{ note }}</td>
             </tr>
-          </table>
+          </table> -->
         </div>
 
         <div>

+ 16 - 12
src/views/index/components/printReceipt1.vue

@@ -51,10 +51,12 @@
           >
             <tr style="height: 35px">
               <th style="width: 5%; text-align: center">序号</th>
-              <th style="width: 23.5%; text-align: center">物资名称</th>
-              <th style="width: 22.5%; text-align: center">规格型号</th>
-              <th style="width: 14%">件数</th>
-              <th style="width: 35%">重量</th>
+              <th style="width: 22.5%; text-align: center">物资名称</th>
+              <th style="width: 17.5%; text-align: center">规格型号</th>
+              <th style="width: 5%">件数</th>
+              <th style="width: 6%">重量</th>
+              <th style="width: 20%">过磅时间</th>
+              <th style="width: 24%">摘要</th>
               <!--              <th style="width: 21%">订单日期</th>-->
             </tr>
             <tr
@@ -67,6 +69,8 @@
               <td>{{ item.materialSpe }}{{ item.materialModel }}</td>
               <td>{{ item.materialNumber }}</td>
               <td>{{ item.materialWeight }}</td>
+              <td>{{ item.netWeightTime }}</td>
+              <td>{{ item.saleRemark }}</td>
               <!--              <td>{{ item.makeDate }}</td>-->
             </tr>
           </table>
@@ -81,8 +85,8 @@
             class="tablePart2"
           >
             <tr>
-              <th style="width: 28.5%">收货地点</th>
-              <td style="width: 71.5%">
+              <th style="width: 27.5%">收货地点</th>
+              <td style="width: 72.5%">
                 {{ province }}{{ district }}{{ town }}{{ deliveryAddress }}
               </td>
             </tr>
@@ -98,8 +102,8 @@
             class="tablePart3"
           >
             <tr>
-              <th style="width: 28.5%">收货人</th>
-              <td style="width: 22.5%">{{ consignee }}</td>
+              <th style="width: 27.5%">收货人</th>
+              <td style="width: 23.5%">{{ consignee }}</td>
               <th style="width: 14%">电话</th>
               <td style="width: 35%">{{ consigneeTel }}</td>
             </tr>
@@ -115,15 +119,15 @@
             class="tablePart4"
           >
             <tr>
-              <th style="width: 28.5%">承运商</th>
-              <td style="width: 36.5%">{{ carrierName }}</td>
+              <th style="width: 27.5%">承运商</th>
+              <td style="width: 37.5%">{{ carrierName }}</td>
               <th style="width: 14%">车牌号</th>
               <td style="width: 35%">{{ capacityNumber }}</td>
             </tr>
           </table>
 
           <!-- tablePart9 -->
-          <table
+          <!-- <table
             border="1"
             cellpadding="10"
             cellspacing="0"
@@ -135,7 +139,7 @@
               <th style="width: 28.5%">备注</th>
               <td style="width: 71.5%">{{ note }}</td>
             </tr>
-          </table>
+          </table> -->
         </div>
 
         <div>

+ 18 - 14
src/views/index/components/printReceipt2.vue

@@ -52,10 +52,12 @@
           >
             <tr style="height: 35px">
               <th style="width: 5%; text-align: center">序号</th>
-              <th style="width: 23.5%; text-align: center">物资名称</th>
-              <th style="width: 22.5%; text-align: center">规格型号</th>
-              <th style="width: 14%">件数</th>
-              <th style="width: 35%">重量</th>
+              <th style="width: 22.5%; text-align: center">物资名称</th>
+              <th style="width: 17.5%; text-align: center">规格型号</th>
+              <th style="width: 5%">件数</th>
+              <th style="width: 6%">重量</th>
+              <th style="width: 20%">过磅时间</th>
+              <th style="width: 24%">摘要</th>
               <!--              <th style="width: 21%">订单日期</th>-->
             </tr>
             <tr
@@ -68,6 +70,8 @@
               <td>{{ item.materialSpe }}{{ item.materialModel }}</td>
               <td>{{ item.materialNumber }}</td>
               <td>{{ item.materialWeight }}</td>
+              <td>{{ item.netWeightTime }}</td>
+              <td>{{ item.saleRemark }}</td>
               <!--              <td>{{ item.makeDate }}</td>-->
             </tr>
           </table>
@@ -82,8 +86,8 @@
             class="tablePart2"
           >
             <tr>
-              <th style="width: 28.5%">收货地点</th>
-              <td style="width: 71.5%">
+              <th style="width: 27.5%">收货地点</th>
+              <td style="width: 72.5%">
                 {{ province }}{{ district }}{{ town }}{{ deliveryAddress }}
               </td>
             </tr>
@@ -99,8 +103,8 @@
             class="tablePart3"
           >
             <tr>
-              <th style="width: 28.5%">收货人</th>
-              <td style="width: 22.5%">{{ consignee }}</td>
+              <th style="width: 27.5%">收货人</th>
+              <td style="width: 23.5%">{{ consignee }}</td>
               <th style="width: 14%">电话</th>
               <td style="width: 35%">{{ consigneeTel }}</td>
             </tr>
@@ -116,15 +120,15 @@
             class="tablePart4"
           >
             <tr>
-              <th style="width: 28.5%">承运商</th>
-              <td style="width: 36.5%">{{ carrierName }}</td>
+              <th style="width: 27.5%">承运商</th>
+              <td style="width: 37.5%">{{ carrierName }}</td>
               <th style="width: 14%">车牌号</th>
               <td style="width: 35%">{{ capacityNumber }}</td>
             </tr>
           </table>
 
           <!-- tablePart9 -->
-          <table
+          <!-- <table
             border="1"
             cellpadding="10"
             cellspacing="0"
@@ -133,10 +137,10 @@
             class="tablePart9"
           >
             <tr>
-              <th style="width: 28.5%">备注</th>
-              <td style="width: 71.5%">{{ note }}</td>
+              <th style="width: 27.5%">备注</th>
+              <td style="width: 72.5%">{{ note }}</td>
             </tr>
-          </table>
+          </table> -->
         </div>
 
         <div>