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

src/views/productionPlan/index.vue

@@ -358,8 +358,10 @@
               console.error(error);
             }
             loading.close();
-          }
-        );
+          })
+		  .catch((err)=>{
+			  console.error(err);
+		  })
 
         // this.$router.push({
         //   path: '/productionPlan/workOrderPublish',
@@ -400,7 +402,10 @@
           await del(id);
           this.$message.success('删除成功！');
           this.reload();
-        });
+        })
+		.catch((err)=>{
+			console.error(err);
+		})
       }
     }
   };

src/views/saleOrder/components/create-order.vue

@@ -170,6 +170,7 @@
   import { createOrUpdate, getOrderDetail } from '@/api/saleOrder';
   import { deepClone } from '@/utils';
   import dayjs from 'dayjs';
+  import { multiply } from '@/utils/math';
   export default {
     components: {
       EquipmentDialog
@@ -372,10 +373,15 @@
       inputNumber (row, index) {
         const pos = this.form.productInfoList;
         if (pos[index].productUnitWeight) {
+			const number = multiply(
+                    row.contractNum,
+                    row.productUnitWeight
+                )
+			console.log('number',number)
           this.$set(
             pos[index],
             'productWeight',
-            row.contractNum * row.productUnitWeight
+             number
           );
         }
       }

src/views/saleOrder/salesToProduction.vue

@@ -399,7 +399,7 @@
             item.planProductNum = item.lackNum;
             item.requiredFormingNum = item.lackNum;
             item.reqMoldTime = dayjs(
-              new Date(item.deliveryTime).getTime() + 3600 * 1000 * 24 * 10
+              new Date(item.deliveryTime).getTime() - 3600 * 1000 * 24 * 10
             ).format('YYYY-MM-DD');
           });
           if (this.form.salesOrders.every((itm) => itm.orderType == 2)) {
@@ -548,7 +548,7 @@
             item.planProductNum = item.lackNum;
             item.requiredFormingNum = item.lackNum;
             item.reqMoldTime = dayjs(
-              new Date(item.deliveryTime).getTime() + 3600 * 1000 * 24 * 10
+              new Date(item.deliveryTime).getTime() - 3600 * 1000 * 24 * 10
             ).format('YYYY-MM-DD');
             return item;
           })