Merge branch 'feature/order_edit' into release

src/pages/create_order/create_order.vue

@@ -422,14 +422,14 @@
           <view class="corder-phone">
             <input class="countrySn-input" v-model="params.collectionProxy"  type="number" :placeholder="$lang.lang.create.money" />
             <view class="countrySn-item">
-              <picker class="countrySn" style="width: 100px"
+              <picker class="countrySn" style="width: 100px; height: 1.4em"
                       :value="config.currencyType.index"
                       :range="config.currencyType.label"
                       data-config="currencyType"
                       data-key="collectionProxyCurrency"
                       @change="configChange"
                       v-if="config.currencyType.value.length > 0">
-                <view class="uni-input">{{config.currencyType.label[config.currencyType.index]}}</view>
+                <view class="uni-input">{{config.currencyType.label[config.currencyType.index] || $lang.lang.create.choose}}</view>
               </picker>
               <image class="rgt" src="../../static/img/rgt.png" mode="widthFix"></image>
             </view>
@@ -1016,7 +1016,7 @@
 						value: [],
 					},
 					currencyType:{
-						index: 0,
+						index: null,
 						label: [],
 						value: [],
 					},
@@ -1071,7 +1071,9 @@
 					type:'',
 					isCollection:false,
 					issuingMethod:1,
-					doubleClear:2
+					doubleClear:2,
+          // 清关证书默认否
+          customsClearCert: false
 				},
 				goodsModel:{
 					prodTitleZh:'',
@@ -1722,6 +1724,21 @@
 				if(!this.collectionShow){
 					this.params.isCollection = false
 				}
+        // 如果选择了代收货款则判断是否设置了代收金额和货币单位
+        if(this.params.isCollection){
+          if(!this.params.collectionProxy){
+            return uni.showToast({
+              title: this.$lang.lang.create.needCollectionAmount,
+              icon: 'error',
+            })
+          }
+          if(!this.params.collectionProxyCurrency){
+            return uni.showToast({
+              title: this.$lang.lang.create.needCollectionCurrency,
+              icon: 'error',
+            })
+          }
+        }
 				if(this.params.harvestMethod!=2){
 					this.params.consigneeAddress = ''
 				}
@@ -1741,7 +1758,7 @@
         this.isClick = false
 			},
 			creatOrder(){
-				this.$request.post('/app-api/my/order/create',this.params).then(res => {
+				this.$request.post('/app-api/my/order/create', {...this.params, hasConsignee: this.hasConsignee}).then(res => {
 					this.isClick = false
 					if(res.code == 0&&res.data){
 						this.params = {

src/pages/orderInfo/orderInfo.vue

@@ -176,7 +176,7 @@
             <view style="height: 36px;">{{$lang.lang.orderInfo.datas}}：{{orderData.sumNum}}{{$lang.lang.orderInfo.box}} {{orderData.vweight}}KG  {{orderData.wvolume}}m³ {{orderData.sumQuantity}}{{$lang.lang.create.aunit}}</view>
 						<view style="height: 36px;">{{$lang.lang.orderInfo.customsType}}：{{getConfigLabel('customsType',orderData.customsType)}}</view>
             <view style="height: 36px;">{{$lang.lang.orderInfo.isCargoControl}}：{{orderData.isCargoControl?$lang.lang.orderInfo.yes:$lang.lang.orderInfo.no}}</view>
-						<view>{{$lang.lang.create.specialNote}}: {{orderData.packageRemarks||''}}</view>
+						<view style="height: 36px;">{{$lang.lang.create.specialNote}}: {{orderData.packageRemarks||''}}</view>
 					</view>
 				</view>
         <view class="addicon" @click="basicShowMore=!basicShowMore">
@@ -195,7 +195,7 @@
                 </view>
                 <view style="height: 36px;" v-if="['3','4'].indexOf(orderData.transportId+'') > -1">{{$lang.lang.orderInfo.unpack}}：{{orderData.isUnpack?$lang.lang.orderInfo.is:$lang.lang.orderInfo.no}}</view>
                 <view style="height: 36px;">{{$lang.lang.orderInfo.loans}}：{{orderData.collectionProxy?($lang.lang.orderInfo.yes+' ('+orderData.collectionProxy+getType(orderData.collectionProxyCurrency)+')'):$lang.lang.orderInfo.no}}</view>
-                <view style="height: 72px;" v-if="orderData.isExternalWarehouse&&orderData.externalWarehousedtolist.length>0">
+                <view style="height: 72px;" v-if="orderData.isExternalWarehouse&& orderData.externalWarehousedtolist && orderData.externalWarehousedtolist.length">
                   <text>{{$lang.lang.orderInfo.warehouseName}}:{{$lang.lang.orderInfo.externalWarehouse}}</text>
                   <text>{{$lang.lang.orderInfo.estLoading}}:{{orderData.externalWarehousedtolist[0].estLoadingtime}}</text>
                   <text>{{$lang.lang.orderInfo.loadingAddress}}:{{orderData.externalWarehousedtolist[0].loadingAddress}}</text>
@@ -570,21 +570,21 @@
 				}
 			},
 			getcurrency () {
-				this.$request.getConfig('commission_currency_type').then(res => {
+				/*this.$request.getConfig('commission_currency_type').then(res => {
 					if(res.code==0&&res.data&&res.data.list.length>0){
 						this.currencyType = res.data.list
 					}
-				})
+				})*/
+        this.$request.get('/app-api/ecw/currency/list').then(res => {
+          if(res.code==0&&res.data&&res.data.length>0){
+            this.currencyType = res.data
+          }
+        })
 			},
 			getType(value){
-				var title = ''
-				let that = this
-				that.currencyType.forEach((item)=>{
-					if(item.value == value){
-						title =  item.label + '('+ item.labelEn+')'
-					}
-				})
-				return title
+				const item = this.currencyType?.find(item => item.id === value)
+        if(!item) return ''
+        return item[this.$lang.locale === 'zh' ? 'titleZh' : 'titleEn']
 			},
 			getChannelName(id){
 				var label = this.channelData.find(item=>item.channelId == id)

src/static/lang/zh/create.js

@@ -100,8 +100,8 @@ export default {
   "issuingMethod": "出单方式",
   "dianfang": "电放",
   "zhengben": "正本",
-  "payment": "是否代收贷款",
-  "money": "代收贷款金额",
+  "payment": "是否代收货款",
+  "money": "代收货款金额",
   "busNotice": "根据国家公安部、安监总局等部门所有入仓货物需要“实名制”登记,请联系客服上传营业执照",
   "baojia": "关联报价单",
   "more": "查看更多",
@@ -112,5 +112,8 @@ export default {
   "cnotice4": "该货物由发货人提供相关出口单证并委托我司代为办理",
   "cnotice5": "该货物有以上两种情况出现",
   "overSeaWarehouseTips": "如需海外仓服务，请联系客服，服务热线：400-900-9962",
-  "other": "其他"
+  "other": "其他",
+  "choose": "请选择",
+  "needCollectionAmount": "请设置代收货款金额",
+  "needCollectionCurrency": "请选择代收货币单位",
 }