Merge branch 'xiaozy_产品列表' of http://121.196.213.68:3000/xiaozhiyong/refinery-admin into lixuan

src/views/order/components/billOfLading.vue

@@ -339,10 +339,11 @@ export default {
       this.billData.list.forEach(element => {
         this.quantity += element.accDeliveryQuantity
       });
-      this.$confirm('确定下单?', '提示', { type: 'error' }).then(() => {
+      this.$confirm('确定下单?', '提示', { type: 'success' }).then(() => {
         let data={
           id:this.controlWindows.addInfo.id,
-          actQuantity:this.quantity
+          actQuantity:this.quantity,
+          customerId:this.controlWindows.addInfo.customerId
         }
         order.orderSuccess(data).then((res) => {
             if (res.code === 20000) {