feat(销售订单): 添加裁线米段字段并调整打印模板

src/BIZComponents/inventoryTable.vue

@@ -2467,6 +2467,7 @@
           this.$set(parasm, 'batchNo', item.batchNo);
           this.$set(parasm, 'imgCode', '');
           this.$set(parasm, 'produceType', item.componentAttribute);
+          this.$set(parasm, 'taxRate', item.taxRate ? item.taxRate : this.isContractBook ? this.defTaxRate : this.isTaxRate == 1 ? this.defTaxRate : undefined);
           let goodsData = await getGoodsByCategoryId(item.productId);
           goodsData = goodsData.filter((item) => item.approvalStatus == 2);
           if (goodsData?.length) {

src/BIZComponents/inventoryTableDetails.vue

@@ -524,7 +524,6 @@
             label: '仓库名称',
             slot: 'warehouseName',
             align: 'center',
-            isNone: !this.isWms
           },
           {
             minWidth: 160,
@@ -532,7 +531,6 @@
             label: '库存数量',
             showOverflowTooltip: true,
             align: 'center',
-            isNone: !this.isWms
           },
           {
             minWidth: 140,

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

@@ -334,6 +334,17 @@
           <span>{{ scope.row.warehouseNum }}</span>
         </el-form-item>
       </template>
+      <template v-slot:cuttingLength="{ row, $index }">
+        <el-form-item
+          :prop="'datasource.' + $index + '.cuttingLength'"
+        >
+          <el-input
+            v-model="row.cuttingLength"
+            placeholder="请输入"
+          >
+          </el-input>
+        </el-form-item>
+      </template>
       <!-- <template v-slot:saleUnit="scope">
         <el-form-item
           style="margin-bottom: 20px"
@@ -895,6 +906,13 @@
             slot: 'discountTotalPrice',
             align: 'center'
           },
+          {
+            minWidth: 280,
+            prop: 'cuttingLength',
+            label: '裁线米段',
+            align: 'center',
+            slot: 'cuttingLength'
+          },
           {
             width: 120,
             prop: 'imgCode',
@@ -1411,6 +1429,7 @@
         });
       },
       replaceTable(list) {
+        console.log('list~~~~', list);
         list.forEach((item) => {
           item['relationId'] = this.current.tempId;
         });

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

@@ -65,8 +65,8 @@
         <tbody>
           <tr align="center">
             <td style="padding: 5px; width: 4%"> 序号 </td>
-            <td style="padding: 5px; width: 18%"> 名称 </td>
-            <td style="padding: 5px; width: 18%"> 规格型号 </td>
+            <!-- <td style="padding: 5px; width: 18%"> 名称 </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: 8%"> 颜色 </td>
@@ -77,21 +77,22 @@
 
           <tr align="center" v-for="(item, index) in formData.productList">
             <td style="padding: 5px"> {{ index + 1 }} </td>
-            <td style="padding: 5px"> {{ item.productName }} </td>
+            <!-- <td style="padding: 5px"> {{ item.productName }} </td> -->
             <td style="padding: 5px">
-              {{ item.specification }}/{{ item.modelType }}
+              <!-- {{ item.specification }}/ -->
+              {{ item.modelType }}
             </td>
             <td style="padding: 5px"> {{ item.measuringUnit }}</td>
             <td style="padding: 5px"> {{ item.totalCount }}</td>
             <td style="padding: 5px"> {{ item.colorKey }}</td>
             <td style="padding: 5px"> {{ item.batchNo }}</td>
-            <td style="padding: 5px"> {{ item.remark }}</td>
+            <td style="padding: 5px"> {{ item.cuttingLength }}</td>
             <td style="padding: 5px"> {{ item.warehouseName }}</td>
           </tr>
           <tr align="center">
             <td style="padding: 5px"> </td>
             <td style="padding: 5px"> 合计 </td>
-            <td style="padding: 5px" colspan="2">  </td>
+            <td style="padding: 5px">  </td>
             <td style="padding: 5px">{{ getTotalValue('totalCount', 2) }} </td>
             <td style="padding: 5px"> </td>
             <td style="padding: 5px"> </td>

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

@@ -64,8 +64,8 @@
       >
         <tbody>
           <tr align="center">
-            <td style="padding: 5px; width: 15%"> 名称 </td>
-            <td style="padding: 5px; width: 15%"> 规格型号 </td>
+            <!-- <td style="padding: 5px; width: 15%"> 名称 </td> -->
+            <td style="padding: 5px; width: 20%"> 规格型号 </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>
@@ -77,9 +77,10 @@
           </tr>
 
           <tr align="center" v-for="(item, index) in formData.productList">
-            <td style="padding: 5px"> {{ item.productName }} </td>
+            <!-- <td style="padding: 5px"> {{ item.productName }} </td> -->
             <td style="padding: 5px">
-              {{ item.specification }}/{{ item.modelType }}
+              <!-- {{ item.specification }}/ -->
+              {{ item.modelType }}
             </td>
             <td style="padding: 5px"> {{ item.measuringUnit }}</td>
             <td style="padding: 5px"> {{ item.totalCount }}</td>
@@ -92,7 +93,7 @@
           </tr>
           <tr align="center">
             <td style="padding: 5px"> 合计 </td>
-            <td style="padding: 5px" colspan="2">  </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>