Merge branch 'dev' into pre-production

src/views/distribution/turndelivery/deliveryDiscuss.vue

@@ -212,7 +212,7 @@
                   <el-radio label="1" size="large">商配</el-radio>
                 </el-radio-group>
               </el-form-item>
-              <el-form-item label="是否整车"    v-if="kind">
+              <el-form-item label="是否整车" v-if="kind">
                 <el-radio-group v-model="DataSubmit.isAll">
                   <el-radio :value="1" size="large">是 </el-radio>
                   <el-radio :value="0" size="large">否</el-radio>
@@ -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),
+});
+
 // 司机选择信息
 // 车辆选项
 // 备货人员
@@ -813,7 +818,7 @@ const DataSubmit = ref({
   ],
   masterDriverName: null, //主司机
   masterVehicleNub: null, //主车辆
-  isAll:0,
+  isAll: 0,
   remarks: null, //备注
   reservation: {
     deliveryType: '1', //配送类型  固定商配
@@ -984,7 +989,7 @@ onMounted(() => {
     // wrapLoading.value = true; //表示这是编辑状态
     editLoading.value = true; //开启加载
     getDeliveryList(route.query.id)
-      .then( async res => {
+      .then(async res => {
         console.log(res, '页面信息');
 
         //司机配置
@@ -1035,7 +1040,7 @@ onMounted(() => {
               }
             });
           }
-          DataSubmit.value.isAll =res.data.data.isAll;//是否整车
+          DataSubmit.value.isAll = res.data.data.isAll; //是否整车
         }
 
         wrapDataInfo.value = res.data.data.stockArticleList || ''; // 订单包件
@@ -1057,9 +1062,10 @@ onMounted(() => {
         DataSubmit.value.stockup.goodsAreaName = stockupInfo.stockupArea || ''; //备货区域名称
         DataSubmit.value.stockup.outboundDate = stockupInfo.outboundDate || ''; //出库时间
         DataSubmit.value.stockup.stockupDate = stockupInfo.stockupDate || ''; //备货时间
-        await  tooSUM();
+        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 = {};