Merge branch 'release' into 'jd_dev'

Release最新代码合并入捷道研发分支20241120

See merge request !37

src/pages/create_order/create_order.vue

@@ -146,7 +146,8 @@
         <!--目的城市-->
 				<view class="corder-tab1-item corder-picker">
 					<image src="../../static/img/corder-1-4.png" mode=""></image>
-					<text><span class="redcolor">*</span>{{$lang.lang.create.endCity}}</text>
+          <!--2024-11-21 要求改非必填 https://devops.aliyun.com/projex/bug/JDAA-127# 《3	APP城市非必填》-->
+					<text><!--<span class="redcolor">*</span>-->{{$lang.lang.create.endCity}}</text>
           <picker class="v-picker" :range="filteredDstCityList" :range-key="shiRangeKey" :value="currentDstCityIndex" @change="changeDstCity">
             <view class="uni-input">{{ currentDstCityIndex !== null ? filteredDstCityList[currentDstCityIndex][shiRangeKey] : $lang.lang.create.choose }}</view>
           </picker>
@@ -1987,23 +1988,14 @@
 							that.getConfigIndex('provinceList',that.params.consigneeVO.city)
 						}
 						that.getConIndex()
-						if(that.params.consigneeVO&&that.params.consigneeVO.deliveryDate){
-							that.params.deliveryDate = that.params.consigneeVO.deliveryDate
-							var dateArr = that.params.consigneeVO.deliveryDate.split(' ')
+            // 2024-11-21测试consigneeVO下面的deliveryDate为null，而且可能没有收货人所有不能据此回显
+						if(that.params.deliveryDate){
+							var dateArr = that.params.deliveryDate.split(' ')
 							that.date = dateArr[0]
 							that.time = dateArr[1]
 						}
 						that.getOffData()
 
-            // // 没有收货人信息
-            // if(!that.params.consigneeVO){
-            //   that.hasConsignee = false
-            // }
-            // 如果用户当前不支持无收货人，则强制显示收货人信息
-            // if(that.noConsignee){
-            //   that.hasConsignee = true
-            // }
-
             // 回显目的城市和目的国
             const dstCityIndex = this.filteredDstCityList.findIndex(item => item.shi === that.params.objectiveId)
             if(dstCityIndex > -1){
@@ -2038,7 +2030,10 @@
               this.currentHarvestIndex = harvestIndex
             }
 
-            // this.hasConsignee = res.data.hasConsignee
+            this.hasConsignee = res.data.hasConsignee
+            if (!that.noConsignee){
+              this.hasConsignee = true
+            }
           }
 				})
 			},
@@ -2690,7 +2685,7 @@
 			getCon(){
 				let that = this
 				that.$request.get('/app-api/ecw/admin-client/page',{page:that.page,rows:10,searchKey:that.searchKey}).then(res => {
-					if(res.code==0&&res.data&&res.data.list.length>0){
+					if(res.code==0){
 						if(that.page==1){
 							that.consignee = []
 							that.consignee = res.data.list

src/pages/order/order.vue

@@ -102,17 +102,17 @@
 							<view v-if='item.status==5&&item.status!=88' @click="returnOrder(index)">{{$lang.lang.order.exit}}</view>
 							<view v-if='item.abnormalState!=0&&item.status!=88' @click="toException(item.orderId)">{{$lang.lang.order.toDeal}}</view>
 						</view>
-						<view  class="order-btn" v-if="item.status!=88&&item.customsType==2">
-							<view  @click="openFile(item.orderId,item.orderNo)">{{$lang.lang.notices.upCustome}}</view>
+						<view  class="order-btn">
+							<view  @click="copy(item.orderId)">{{$lang.lang.order.copy}}</view>
 						</view>
 					</view>
 				</view>
 
 				<!-- <view class="order-btn">退仓</view> -->
 
-			</view>		
+			</view>
 		</view>
-		
+
 		<view class="bom">
 			<view class="" @click="toCreatOrders">
 				<image src="../../static/img/carFa.png" mode=""></image>
@@ -145,7 +145,7 @@
 						</view>
 					</view>
 				</view>
-				<view class="apply-btn"> 
+				<view class="apply-btn">
 					<view @click="sumbitApply">{{$lang.lang.order.isExit}}</view>
 					<view @click="closeApply">{{$lang.lang.order.consider}}</view>
 				</view>
@@ -178,7 +178,7 @@
 						<text>{{transItem}}</text>
 					</view>
 				</view>
-				
+
 				<view class="screen_list">
 					<view>
 						<text>{{$lang.lang.order.time}}</text>
@@ -400,14 +400,14 @@
 
 					<view class="lending_btns">
 						<view @click="$refs.lendingLog.close()">{{$lang.lang.order.confirm}}</view>
-						<view @click="$refs.lendingLog.close()">{{$lang.lang.order.cancel}}</view>		
+						<view @click="$refs.lendingLog.close()">{{$lang.lang.order.cancel}}</view>
 					</view>
 			</view>
 		</uni-popup>
 		<uni-popup ref="choiceTransport" type="center" :mask-click="false">
 			<view class="ad-conten type-1">
 				<image @click="closeTransport" class="ad-bg1" src="../../static/img/colse1.png"></image>
-				
+
 				<view class="transport-title">
 					<span>{{$lang.lang.notices.transport}}</span>
 				</view>
@@ -432,7 +432,7 @@
 					</view>
 					<view class="lending_btns">
 						<view @click="$refs.controlLog.close()">{{$lang.lang.order.confirm}}</view>
-						<view @click="$refs.controlLog.close()">{{$lang.lang.order.cancel}}</view>		
+						<view @click="$refs.controlLog.close()">{{$lang.lang.order.cancel}}</view>
 					</view>
 			</view>
 		</uni-popup>
@@ -572,7 +572,7 @@
 						this.userInfo = res.data
 						this.isHavePassword = this.userInfo.isHavePassword
 					}
-			
+
 				})
 			},
 			//放贷弹窗
@@ -721,7 +721,7 @@
 							this.page = 1
 							this.getControl()
 						},2000)
-						
+
 						this.$refs.transfer.close()
 						uni.showToast({
 							title:this.$lang.lang.notices.operation,
@@ -735,8 +735,8 @@
 					}
 				})
 			},
-			
-			transferFromShow(){	
+
+			transferFromShow(){
 				this.$refs.lending.close()
 				this.$refs.transfer.open()
 			},
@@ -751,7 +751,7 @@
 			//查看放贷记录
 			seeLending(id,index){
 				this.lendingdata = {}
-				this.selectOrder = this.data[index]	
+				this.selectOrder = this.data[index]
 				this.getLendingData(id)
 			},
 			ismobileLend(){
@@ -772,8 +772,8 @@
 			addLending(){
 				this.lendingFrom.orderId = this.selectOrder.orderId
 				this.lendingFrom.orderNo = this.selectOrder.orderNo
-				
-				
+
+
 				this.$request.post('/app-api/order/order-cargo-control-pick/create', this.lendingFrom).then(res => {
 					if(res.code==0){
 
@@ -871,7 +871,7 @@
 					this.config[e.target.dataset.config].index = e.detail.value
 					this.lendingFrom[e.target.dataset.key] = this.config[e.target.dataset.config].value[e.detail.value]
 				}
-				
+
 			},
 			//放贷
 			tolending(index,type){
@@ -891,7 +891,7 @@
 				setTimeout(()=>{
 					this.$refs.lending.open()
 				},500)
-				
+
 			},
 			//获取区号
 			getCountrySn(){
@@ -920,7 +920,7 @@
 						}else{
 							that.config.countrySn.indexs = index
 						}
-						
+
 					}
 				})
 			},
@@ -1084,7 +1084,7 @@
 				let year = date.getFullYear();
 				let month = date.getMonth() + 1;
 				let day = date.getDate();
-				
+
 				month = month > 9 ? month : '0' + month;
 				day = day > 9 ? day : '0' + day;
 				return `${year}-${month}-${day}`;
@@ -1109,7 +1109,7 @@
 								this.pages = res.data.pages
 							}
 							this.nvs[0].nums = res.data.total
-							
+
 						}else{
 							this.data = this.data.concat(res.data.list)
 						}
@@ -1146,7 +1146,7 @@
 						setTimeout(()=>{
 							this.changeIndex(this.selectIndex)
 						},2000)
-						
+
 					}else{
 						uni.showToast({
 							title:res.msg,
@@ -1174,7 +1174,7 @@
 				})
 			},
 			delOrder(id){
-			
+
 				let that = this
 				uni.showModal({
 					title: this.$lang.lang.notices.notice,
@@ -1257,7 +1257,7 @@
 								}
 							})
 						}
-						
+
 					},
 					fail: (Error) => {
 						console.log(Error)
@@ -1295,7 +1295,7 @@
 					}
 					this.$refs.controlLog.open()
 				})
-				
+
 			},
 			//放货方式
 			doubleClear: function(evt) {
@@ -1317,14 +1317,19 @@
 			open(){
 				// this.$refs.declaration.open()
 			},
-			orderConfig () {
+			/*orderConfig () {
 				let that = this
 				that.$request.getConfig('transport_type').then(res => {
 					if(res.code==0&&res.data&&res.data.list.length > 0){
 						that.transType = res.data.list
 					}
 				})
-			},
+			},*/
+      copy(orderId){
+        this.$request.post("/app-api/my/order/copy/" + orderId).then(res => {
+          this.toEditOrder(res.data)
+        })
+      }
 		},
 
 	}
@@ -1332,4 +1337,4 @@
 
 <style>
 	@import url("../../static/css/order.css");
-</style>
\ No newline at end of file
+</style>

src/static/lang/zh/order.js

@@ -79,5 +79,6 @@ export default {
   "member": "会员",
   "manager": "管理员",
   "lendingType": "校验方式",
-  "lendSussess": "放货成功"
-}
\ No newline at end of file
+  "lendSussess": "放货成功",
+  "copy": "复制"
+}