fix: 修复订单产品ID赋值并优化销售订单打印模板样式

src/views/purchasingManage/purchaseOrder/components/addDialogNew.vue

@@ -915,6 +915,7 @@
         shippingModePurchaseOp,
         transactionMethodsOp,
         defaultTransactionMode: 1,
+        isBatchNo: 0
       };
     },
     computed: {
@@ -1031,6 +1032,13 @@
       }).then((res) => {
         this.defaultTransactionMode = +res.value;
       });
+
+      //批次号是否必填//0否 1是
+      parameterGetByCode({
+        code: 'eom_saleOrder_entrusted_batchNo'
+      }).then((res) => {
+        this.isBatchNo = res.value;
+      });
     },
     methods: {
       getSupplierData(data) {

src/views/saleManage/saleOrder/components/printTemplateSaleOrder.vue

@@ -66,41 +66,44 @@
       >
         <tbody>
           <tr align="center">
-            <td style="padding: 5px"> 名称 </td>
-            <td style="padding: 5px"> 规格型号 </td>
-            <td style="padding: 5px; width: 60px"> 单位</td>
-            <td style="padding: 5px; width: 110px"> 数量</td>
-            <td style="padding: 5px; width: 110px"> 单价</td>
-            <td style="padding: 5px; width: 110px"> 税率</td>
-            <td style="padding: 5px; width: 110px"> 金额</td>
-            <td style="padding: 5px"> 颜色 </td>
-            <td style="padding: 5px"> 备注</td>
+            <td style="padding: 2px; width: 5%"> 序号 </td>
+            <td style="padding: 2px; width: 17%"> 名称 </td>
+            <td style="padding: 2px; width: 18%"> 规格型号 </td>
+            <td style="padding: 2px; width: 6%"> 单位</td>
+            <td style="padding: 2px; width: 8%"> 数量</td>
+            <td style="padding: 2px; width: 10%"> 单价</td>
+            <td style="padding: 2px; width: 8%"> 税率</td>
+            <td style="padding: 2px; width: 8%"> 金额</td>
+            <td style="padding: 2px; width: 8%"> 颜色 </td>
+            <td style="padding: 2px; width: 10%"> 备注</td>
           </tr>
 
           <tr align="center" v-for="(item, index) in formData.productList">
-            <td style="padding: 5px"> {{ item.productName }} </td>
-            <td style="padding: 5px">
-              {{ item.specification }}/{{ item.modelType }}
+            <td style="padding: 2px"> {{ index + 1 }} </td>
+            <td style="padding: 2px"> {{ item.productName }} </td>
+            <td style="padding: 2px">
+              <!-- {{ item.specification }}/ -->
+              {{ item.modelType }}
             </td>
-            <td style="padding: 5px"> {{ item.saleUnit }}</td>
-            <td style="padding: 5px"> {{ item.saleCount }}</td>
-            <td style="padding: 5px"> {{ item.singlePrice }}</td>
-            <td style="padding: 5px"> {{ item.taxRate }}{{ item.taxRate ? '%' : '' }}</td>
-            <td style="padding: 5px"> {{ item.totalPrice }}</td>
-            <td style="padding: 5px"> {{ item.colorKey }}</td>
+            <td style="padding: 2px"> {{ item.saleUnit }}</td>
+            <td style="padding: 2px"> {{ item.saleCount }}</td>
+            <td style="padding: 2px"> {{ item.singlePrice }}</td>
+            <td style="padding: 2px"> {{ item.taxRate }}{{ item.taxRate ? '%' : '' }}</td>
+            <td style="padding: 2px"> {{ item.totalPrice }}</td>
+            <td style="padding: 2px"> {{ item.colorKey }}</td>
             <!-- <td style="padding: 5px"> {{ item.modelKey }}</td> -->
-            <td style="padding: 5px"> {{ item.remark }}</td>
+            <td style="padding: 2px"> {{ item.remark }}</td>
           </tr>
           <tr align="center">
-            <td style="padding: 5px"> 合计 </td>
-            <td style="padding: 5px" colspan="2">  </td>
-            <td style="padding: 5px">{{ getTotalValue('totalCount', 2) }} </td>
-            <td style="padding: 5px"> </td>
-            <td style="padding: 5px"> </td>
+            <td style="padding: 2px"> 合计 </td>
+            <td style="padding: 2px" colspan="2">  </td>
+            <td style="padding: 2px">{{ getTotalValue('totalCount', 2) }} </td>
+            <td style="padding: 2px"> </td>
+            <td style="padding: 2px"> </td>
             <!-- <td style="padding: 5px">{{ getTotalValue('totalPrice', 2) }}</td> -->
-            <td style="padding: 5px"> </td>
-            <td style="padding: 5px"> </td>
-            <td style="padding: 5px"> </td>
+            <td style="padding: 2px"> </td>
+            <td style="padding: 2px"> </td>
+            <td style="padding: 2px"> </td>
           </tr>
         </tbody>
       </table>

src/views/saleManage/saleOrder/invoice/components/addInvoiceDialog.vue

@@ -533,6 +533,7 @@
           if (productList && productList.length > 0) {
             productList.forEach((v) => {
               v.orderTotalCount = v.totalCount;
+              v.orderProductId = v.orderProductId || v.id;
               v.extField = {};
             });
           }

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

@@ -32,8 +32,8 @@
           font-size: 12px;
           display: flex;
           justify-content: space-between;
-          margin-bottom: 10px;
-          margin-top: 10px;
+          margin-bottom: 5px;
+          margin-top: 5px;
         "
       >
         <span style="width: 55%">客户：{{ formData.contactName }}</span>
@@ -46,7 +46,7 @@
           font-size: 12px;
           display: flex;
           justify-content: space-between;
-          margin-bottom: 10px;
+          margin-bottom: 5px;
         "
       >
         <span style="width: 55%">项目：{{ formData.projectName }}</span>
@@ -66,40 +66,42 @@
         <tbody>
           <tr align="center">
             <!-- <td style="padding: 5px; width: 15%"> 名称 </td> -->
-            <td style="padding: 5px; width: 22%"> 规格型号 </td>
-            <td style="padding: 5px; width: 6%"> 单位</td>
-            <td style="padding: 5px; width: 8%"> 数量</td>
-            <td style="padding: 5px; width: 10%" v-if="isPrintPrice"> 单价</td>
-            <td style="padding: 5px; width: 8%" v-if="isPrintPrice"> 税率</td>
-            <td style="padding: 5px; width: 10%" v-if="isPrintPrice"> 金额</td>
-            <td style="padding: 5px; width: 10%"> 颜色 </td>
+             <td style="padding: 2px; width: 5%"> 序号 </td>
+            <td style="padding: 2px; width: 22%"> 规格型号 </td>
+            <td style="padding: 2px; width: 6%"> 单位</td>
+            <td style="padding: 2px; width: 8%"> 数量</td>
+            <td style="padding: 2px; width: 10%" v-if="isPrintPrice"> 单价</td>
+            <td style="padding: 2px; width: 8%" v-if="isPrintPrice"> 税率</td>
+            <td style="padding: 2px; width: 10%" v-if="isPrintPrice"> 金额</td>
+            <td style="padding: 2px; width: 10%"> 颜色 </td>
             <!-- <td style="padding: 5px; width: 10%"> 机型 </td> -->
-            <td style="padding: 5px; width: 12%"> 备注</td>
+            <td style="padding: 2px; width: 12%"> 备注</td>
           </tr>
 
           <tr align="center" v-for="(item, index) in formData.productList">
             <!-- <td style="padding: 5px"> {{ item.productName }} </td> -->
-            <td style="padding: 5px">
+             <td style="padding: 2px"> {{ index + 1 }}</td>
+            <td style="padding: 2px">
               <!-- {{ item.specification }}/ -->
               {{ item.modelType }}
             </td>
-            <td style="padding: 5px"> {{ item.saleUnit }}</td>
-            <td style="padding: 5px"> {{ item.saleCount }}</td>
-            <td style="padding: 5px;" v-if="isPrintPrice"> {{ item.singlePrice }}</td>
-            <td style="padding: 5px;" v-if="isPrintPrice"> {{ item.taxRate }}{{ item.taxRate ? '%' : '0%' }}</td>
-            <td style="padding: 5px;" v-if="isPrintPrice"> {{ item.totalPrice }}</td>
-            <td style="padding: 5px"> {{ item.colorKey }}</td>
+            <td style="padding: 2px"> {{ item.saleUnit }}</td>
+            <td style="padding: 2px"> {{ item.saleCount }}</td>
+            <td style="padding: 2px;" v-if="isPrintPrice"> {{ item.singlePrice }}</td>
+            <td style="padding: 2px;" v-if="isPrintPrice"> {{ item.taxRate }}{{ item.taxRate ? '%' : '0%' }}</td>
+            <td style="padding: 2px;" v-if="isPrintPrice"> {{ item.totalPrice }}</td>
+            <td style="padding: 2px"> {{ item.colorKey }}</td>
             <!-- <td style="padding: 5px"> {{ item.modelKey }}</td> -->
-            <td style="padding: 5px"> {{ item.remark }}</td>
+            <td style="padding: 2px"> {{ item.remark }}</td>
           </tr>
           <tr align="center">
-            <td style="padding: 5px"> 合计 </td>
-            <td style="padding: 5px">  </td>
-            <td style="padding: 5px">{{ getTotalValue('totalCount', 2) }} </td>
-            <td style="padding: 5px" v-if="isPrintPrice"> </td>
-            <td style="padding: 5px" v-if="isPrintPrice"> </td>
-            <td style="padding: 5px" v-if="isPrintPrice"> {{ getTotalValue('totalPrice', 2) }} </td>
-            <td style="padding: 5px" colspan="2"> {{ isPrintPrice ? convertToChinese(getTotalValue('totalPrice', 2)) : '' }} </td>
+            <td style="padding: 2px"> 合计 </td>
+            <td style="padding: 2px">  </td>
+            <td style="padding: 2px">{{ getTotalValue('totalCount', 2) }} </td>
+            <td style="padding: 2px" v-if="isPrintPrice"> </td>
+            <td style="padding: 2px" v-if="isPrintPrice"> </td>
+            <td style="padding: 2px" v-if="isPrintPrice"> {{ getTotalValue('totalPrice', 2) }} </td>
+            <td style="padding: 2px" colspan="2"> {{ isPrintPrice ? convertToChinese(getTotalValue('totalPrice', 2)) : '' }} </td>
             <!-- <td style="padding: 5px"> </td> -->
           </tr>
         </tbody>
@@ -110,7 +112,7 @@
           font-size: 12px;
           display: flex;
           justify-content: space-between;
-          margin-top: 10px;
+          margin-top: 5px;
         "
       >
         <div style="flex: 1">
@@ -128,7 +130,7 @@
           font-size: 12px;
           display: flex;
           justify-content: space-between;
-          margin-top: 10px;
+          margin-top: 5px;
         "
       >
         <div style="width: 75%">