化纤零售单

zkqy-ui/src/views/orderMange/retailMange/index.vue

@@ -608,8 +608,23 @@
                   </el-form-item>
                 </template>
               </el-table-column> -->
-
-              <el-table-column prop="productNumber" label="箱数">
+              <el-table-column prop="productWeight" label="箱数">
+                <template slot-scope="scope">
+                  <el-form-item
+                    :prop="'productWeight-' + scope.$index"
+                    :name="'productWeight-' + scope.$index"
+                    style="margin: 0px; padding: 0px"
+                  >
+                    <el-input
+                      v-model="scope.row.productWeight"
+                      oninput="value=value.replace(/[^0-9.]/g,'')"
+                      size="small"
+                      clearable
+                    ></el-input>
+                  </el-form-item>
+                </template>
+              </el-table-column>
+              <el-table-column prop="productNumber" label="重量">
                 <template slot-scope="scope">
                   <el-form-item
                     :prop="'productNumber-' + scope.$index"
@@ -643,11 +658,11 @@
                   </el-form-item>
                 </template>
               </el-table-column>
-              <!--              <el-table-column prop="productAmounts" label="金额">-->
-              <!--                <template slot-scope="scope">-->
-              <!--                  {{ scope.row.productAmounts }}-->
-              <!--                </template>-->
-              <!--              </el-table-column>-->
+                            <el-table-column prop="productAmounts" label="金额">
+                              <template slot-scope="scope">
+                                {{ scope.row.productAmounts }}
+                              </template>
+                            </el-table-column>
               <el-table-column prop="inventoryBoxNum" label="库存箱数">
                 <template slot-scope="scope">
                   {{ scope.row.inventoryBoxNum }}
@@ -1443,8 +1458,8 @@ export default {
           index === 2 ||
           index === 3 ||
           index === 4 ||
-          index === 7 ||
-          index === 8 ||
+          index === 5 ||
+          index === 12 ||
           index === 9 ||
           index === 10 ||
           index === 11
@@ -1463,7 +1478,7 @@ export default {
             sums[index] = sums[index]?.toFixed(2);
           }
           console.log(sums[index], index);
-          if (index == 7) {
+          if (index == 8) {
             this.totalMoney = sums[index];
           }
         } else {
@@ -1486,8 +1501,8 @@ export default {
         productType: "", //类型
         lotNumber: "", //批号
         productName: "", //货品名称
-        productNumber: 0, //销售数量
-        productWeight: "", //销售重量kg
+        productNumber: 0, //销售重量kg
+        productWeight: "", //销售数量
         productUnitPrice: 0, //单价
         productAmounts: "", //金额
         sliceType: "022", //切片类型  初始为  切片
@@ -2487,7 +2502,7 @@ export default {
             <div style="text-align:center;">销售合同审计单</div>
             <tbody>
                 <tr>
-                    <td width="600px" colspan="4">合同号：${saleNo}</td>
+                    <td width="600px" colspan="5">合同号：${saleNo}</td>
                     <td width="600px" colspan="5">日期：${saleDate.replace(
                       "T",
                       " "
@@ -2497,23 +2512,23 @@ export default {
                     <td width="300px" colspan="2">客户名称：</td>
                     <td width="300px" colspan="3">${customerName}</td>
                     <td colspan="2">业务员：</td>
-                    <td colspan="2">${salesman}</td>
+                    <td colspan="3">${salesman}</td>
 
                 </tr>
                 <tr align="center">
                     <td width="300px" colspan="2">客户地址：</td>
                     <td width="300px" colspan="3">${customAddress}</td>
                     <td width="300px" colspan="2">客户国别：</td>
-                    <td width="300px" colspan="2">${customCountryType}</td>
+                    <td width="300px" colspan="3">${customCountryType}</td>
                 </tr>
                 <tr align="center">
                     <td width="300px" colspan="2">联系人：</td>
-                    <td width="150px" colspan="2">${contactPerson}</td>
+                    <td width="150px" colspan="3">${contactPerson}</td>
                     <td  colspan="2">合计金额（大写）：</td>
                     <td colspan="3">${saleAmountInWords}</td>
                 </tr>
                 <tr align="center">
-                    <td colspan="9">货品明细</td>
+                    <td colspan="10">货品明细</td>
                 </tr>
                 <tr align="center">
                     <td width="150px">品名</td>
@@ -2522,7 +2537,8 @@ export default {
                     <td width="100px">类型</td>
                     <td width="100px">批号</td>
                     <td width="100px">箱数</td>
-                    <td width="100px">单价</td>
+                    <td width="100px">重量KG</td>
+                    <td width="100px">单价/KG</td>
                     <td width="100px">金额</td>
                     <td width="100px">备注</td>
                 </tr>`;
@@ -2552,6 +2568,7 @@ export default {
                     <td>${item.colourNumberLabel}</td>
                     <td>${item.productType}</td>
                     <td>${item.lotNumber}</td>
+                    <td>${item.productWeight}</td>
                     <td>${item.productNumber}</td>
                     <td>${item.productUnitPrice}</td>
                     <td>${item.productAmounts}</td>
@@ -2573,9 +2590,10 @@ export default {
           <td>${singlTotal}</td>
           <td>${moneyTotal}</td>
           <td></td>
+          <td></td>
         </tr>`;
       printStr += `<tr align="left">
-                    <td colspan="9">订单备注:${orderRemark}</td>
+                    <td colspan="10">订单备注:${orderRemark}</td>
                 </tr>
                 </tbody>
         </table>`;