Merge branch 'dev' into pre-production

src/views/distribution/turndelivery/deliveryDiscuss.vue

@@ -483,7 +483,7 @@
         class="columnList mt10"
         style="height: 60vh"
         ref="columnListNode"
-        :columnList="wrapLoading ? wrap : newMenuData"
+        :columnList="wrapLoading ? details.wrap : details.newMenuData"
         :tableData="wrapLoading ? wrapData : data"
         :loading="loading"
         @inputTxt="inputsc"
@@ -698,6 +698,11 @@ const clloading = ref(true);
 /** 编辑时, 初始化车辆信息 */
 const chooseCarIds = ref([]);
 
+const details = reactive({
+  wrap: deepClone(wrap),
+  newMenuData: deepClone(newMenuData),
+});
+
 // 司机选择信息
 // 车辆选项
 // 备货人员
@@ -1059,7 +1064,8 @@ onMounted(() => {
         DataSubmit.value.stockup.stockupDate = stockupInfo.stockupDate || ''; //备货时间
         await tooSUM();
       })
-      .catch((e) => {console.log(e,'error');
+      .catch(e => {
+        console.log(e, 'error');
       })
       .finally(() => {
         editLoading.value = false; //关闭加载
@@ -1178,7 +1184,7 @@ function dataTabInfo() {
 const AddInfo = () => {
   tcstate.value = true; //开启弹窗禁止取消勾选订单状态
   currentPage.value = 1; //重置搜索页码
-  newMenuData.forEach(res => {
+  details.newMenuData.forEach(res => {
     res.values = '';
   });
   parameter.value = {};