Merge branch 'release' into 'jd_dev'

Release分支合并到jd分支20241213

See merge request !43

src/pages/create_order/create_order.vue

@@ -1981,7 +1981,12 @@ export default {
 				let that = this
 				that.$request.get('/app-api/my/order/get',{orderId:id}).then(async (res) => {
 					if(res.code==0&&res.data){
-						that.params = res.data
+            this.params = Object.assign({}, res.data, {
+              orderItemVOList: [],
+              destCountryId: null,
+              consigneeName: '',
+              consigneePhone: ''
+            })
             if (copy){
               // 复制订单，需要将数据初始化
               that.params.orderId = null
@@ -2056,32 +2061,36 @@ export default {
                 that.params.consigneeVO.id = null
                 that.params.consigneeVO.orderId = null
               }
+
             }
 						// if(!that.params.number) that.params.number = ''
 						that.getType()
-						if(that.params.orderItemVOList.length>0){
-							that.params.orderItemVOList.forEach((item,index)=>{
-                if (this.$route.query.copy && this.$route.query.copy == 1) {
-                  item = {
-                    link: item.link,
-                    prodId: item.prodId,
-                    prodTitleEn: item.prodTitleEn,
-                    prodTitleZh: item.prodTitleZh,
-                    prodAttrIds: item.prodAttrIds,
-                    prodType: item.prodType,
-                    volume: item.volume,
-                    weight: item.weight,
-                    quantity: item.quantity,
-                    num: item.num,
-                    worth: item.worth,
-                    boxGauge: item.boxGauge,
-                    brand: item.brand,
-                    brandType: item.brandType
-                  }
+            res.data.orderItemVOList.forEach((item)=>{
+              let newItem = {}
+              if (copy) {
+                newItem = {
+                  link: item.link,
+                  prodId: item.prodId,
+                  prodTitleEn: item.prodTitleEn,
+                  prodTitleZh: item.prodTitleZh,
+                  prodAttrIds: item.prodAttrIds,
+                  prodType: item.prodType,
+                  volume: item.volume,
+                  weight: item.weight,
+                  quantity: item.quantity,
+                  num: item.num,
+                  worth: item.worth,
+                  boxGauge: item.boxGauge,
+                  brand: item.brand,
+                  brandType: item.brandType
                 }
-								if(item.prodAttrIds) item.prodAttrs = item.prodAttrIds.split(',')
-							})
-						}
+              }else {
+                newItem = item
+              }
+              if(newItem.prodAttrIds) newItem.prodAttrs = newItem.prodAttrIds.split(',')
+              that.params.orderItemVOList.push({ ...newItem })
+            });
+
 
 						/*if(that.params.transportId != 0 ||that.params.lineId!=0 ||(that.params.departureId != 0 && that.params.objectiveId != 0)){
 							that.openedRouterF = false