Merge branch 'dev' into test

src/views/distribution/delivery/distributionDelivery.vue

@@ -144,7 +144,7 @@
 </template>
 
 <script>
-import { addDelivery, getDelivery, addDelivery, updateDelivery, removeDelivery } from "@/api/distribution/distributionDelivery";
+import { addDelivery, getDetailDelivery, addDelivery, updateDelivery, removeDelivery } from "@/api/distribution/distributionDelivery";
 import option from "@/option/distribution/distributionDelivery";
 import { mapGetters } from "vuex";
 

src/views/distribution/reservation/reservationFrom.vue

@@ -407,6 +407,9 @@ export default {
     textbox(e,index,a) {
       console.log("e,index",e,index,a);
       this.costList[index+1] = e;
+      if (index===1 && a === 1 ){
+
+      }
       console.log(">>>>>>>",this.costList);
     },
     //数据字典数据获取