Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-aps into dengfei

src/views/productionPlan/components/factoryAdd/index.vue

@@ -1268,8 +1268,8 @@
       // 选择BOM
       async changeBomId(row, index, bomData) {
         if (bomData) {
-          item.bomCategoryName = bomData.name;
-          item.bomCategoryVersions = bomData.versions;
+          row.bomCategoryName = bomData.name;
+          row.bomCategoryVersions = bomData.versions;
         }
         // row.routingList = []
         return await bomRoutingList(row.bomCategoryId).then((res) => {

src/views/saleOrder/components/printTemplateSaleOrder.vue

@@ -65,28 +65,28 @@
         <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; width: 60px"> 单位</td>
             <td style="padding: 5px; width: 110px"> 数量</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"> 备注</td>
+            <td style="padding: 5px"> 生产要求</td>
           </tr>
 
           <tr align="center" v-for="(item, index) in formData.productInfoList">
             <td style="padding: 5px"> {{ item.productName }} </td>
+            <td style="padding: 5px"> {{ item.model }}</td>
             <td style="padding: 5px">
               {{ item.specification }}
             </td>
-            <td style="padding: 5px"> {{ item.model }}</td>
             <td style="padding: 5px"> {{ item.colorKey }}</td>
-            <td style="padding: 5px"> {{ item.measuringUnit }}</td>
             <td style="padding: 5px"> {{ item.contractNum }}</td>
+            <td style="padding: 5px"> {{ item.measuringUnit }}</td>
             <!-- <td style="padding: 5px"> {{ item.totalCount }}</td>
             <td style="padding: 5px"> {{ item.totalCount }}</td> -->
-            <td style="padding: 5px"> {{ item.remark }}</td>
+            <td style="padding: 5px"> {{ item.productionRequirements }}</td>
           </tr>
         </tbody>
       </table>