Skip to content

J
jiedao-app-customer-new-master
Commit 36fe1f67 authored by dragondean@qq.com's avatar dragondean@qq.com
Browse files
Options

Merge branch 'feature/order_edit' into release

parents d190c17f 989781cf
Hide whitespace changes
Inline Side-by-side
Showing with 108 additions and 45 deletions
src/pages/create_order/create_order.vue
View file @ 36fe1f67
......@@ -177,19 +177,13 @@
<view class="corder-goods">
<view class="" v-for="(item,index) in params.orderItemVOList" :key="index">
<view class="corder-gnums">{{index+1}}</view>
<view class="corder-goods-v">
<view class="corder-goods-v-item">
<view class="">
<view class="corder-goods-v" style="flex-direction: column">
<view class="corder-goods-v-item flex">
<view class="flex-1">
<text>{{$lang.lang.create.prodZh}}：</text>
<text>{{item.prodTitleZh}}</text>
</view>
<view class="">
<text>{{$lang.lang.create.brand}}：</text>
<text>{{item.brandType==1?$lang.lang.create.yes:$lang.lang.create.no}}</text>
</view>
</view>
<view class="corder-goods-v-item">
<view class="flex">
<view class="flex flex-1">
<text>{{$lang.lang.create.prodEn}}：</text>
<text class="flex-1">{{item.prodTitleEn}}</text>
<view class="action">
......@@ -197,7 +191,14 @@
<image v-else @click="item.showFull = false" src="../../static/img/sub.png" class="icon"></image>
</view>
</view>
<view class="flex items-center">
</view>
<view class="corder-goods-v-item flex">
<view class="flex-1">
<text>{{$lang.lang.create.brand}}：</text>
<text>{{item.brandType==1?$lang.lang.create.yes:$lang.lang.create.no}}</text>
</view>
<view class="flex-1 flex">
<text>{{$lang.lang.create.form}}：</text>
<text class="flex-1">{{item.num}}{{$lang.lang.create.box}}</text>
<view class="action flex">
......@@ -208,7 +209,7 @@
</view>
</view>
<view class="corder-goods-v" v-if="item.showFull">
<view class="corder-goods-v-item">
<view class="corder-goods-v-item2">
<view class="">
<text>{{$lang.lang.create.num}}：</text>
<text>{{item.quantity||0}}{{$lang.lang.create.aunit}}</text>
......@@ -231,7 +232,7 @@
</view>
</view>
<view class="corder-goods-v-item">
<view class="corder-goods-v-item2">
<view class="">
<text>{{$lang.lang.create.prodAttr}}： </text>
<text>{{getProductAttrLabel(item.prodAttrIds)}}</text>
......@@ -251,6 +252,13 @@
<view class="corder-linkLabel" @click="toLink(item.link)"><input v-model="item.link" type="text" disabled/></view>
<view class="link-btn" @click="openLink(index)">{{item.link?$lang.lang.create.editLink:$lang.lang.create.addLink}}</view>
</view>
<view class="corder-bom" v-if="item.showFull">
<view class="corder-bom-v"></view>
<view class="corder-bom-v">
<view class="" @click="open(index)">{{$lang.lang.create.edit}}</view>
<view class="" @click="delGoods(index)">{{$lang.lang.create.delete}}</view>
</view>
</view>
</view>
</view>
......@@ -414,7 +422,13 @@
<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" :value="config.currencyType.index" :range="config.currencyType.label" data-config="currencyType" data-key="collectionProxyCurrency" @change="configChange" v-if="config.currencyType.value.length > 0">
<picker class="countrySn" style="width: 100px"
: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>
</picker>
<image class="rgt" src="../../static/img/rgt.png" mode="widthFix"></image>
......@@ -1018,7 +1032,35 @@
objectiveId: 0, //目的地ID
lineId: 0, //线路ID
channelId:0,//渠道ID
orderItemVOList:[{showFull: false, prodAttrIds: ''}],
orderItemVOList:[
{
"prodTitleZh": "测试单询产品",
"prodTitleEn": "dd11",
"volume": "1",
"prodAttrs": [
"16"
],
"prodAttrIds": "16",
"brandType": "0",
"num": "1",
"unit": "1",
"quantity": "1",
"weight": "1",
"worth": "123",
"material": null,
"prodId": 3719,
"showFull": true,
"charging": 0,
"clearanceFreight": 20,
"clearanceFreightCurrency": 27,
"clearanceFreightVolume": 7,
"seaFreight": 30,
"seaFreightCurrency": 27,
"seaFreightVolume": 7,
"isPayAdvance": 0,
"premium": 2
}
],
costVO:{},
deliveryDate:currentDate+' 00:00:00',
drawee:2,
......@@ -1069,7 +1111,6 @@
collectionShow:false,
isdisable:false,
searchKey:'',//搜索联系人关键词
page:1,
moreShow:true,
controlLine:false,//线路控货
currencyUnit:0,
......@@ -1156,6 +1197,10 @@
methods: {
changeHasConsignee(e){
this.hasConsignee = e.detail.value === "1"
// 无收货人默认发货人付款
if(!this.hasConsignee){
this.$set(this.params, 'drawee', 1)
}
},
toback(){
uni.navigateBack()
......
src/pages/orderInfo/orderInfo.vue
View file @ 36fe1f67
......@@ -132,9 +132,9 @@
<view class="order-info-title">
<image src=".../../static/img/order-express.png" mode=""></image>
<text>{{$lang.lang.orderInfo.logistics}}</text>
<text class="mudi">{{$lang.lang.orderInfo.startCity}}：{{orderData.initialLogisticsInfoDto?($lang.locale=='zh'?orderData.initialLogisticsInfoDto.startTitleZh:orderData.initialLogisticsInfoDto.startTitleZh):''}}</text>
</view>
<view class="order-info-txt">
<view class="mudi">{{$lang.lang.orderInfo.startCity}}：{{orderData.initialLogisticsInfoDto?($lang.locale=='zh'?orderData.initialLogisticsInfoDto.startTitleZh:orderData.initialLogisticsInfoDto.startTitleZh):''}}</view>
<!-- <view class="">{{$lang.lang.orderInfo.address}}：{{orderData.logisticsInfoDto?($lang.locale=='zh'?orderData.logisticsInfoDto.startAddressZh:orderData.logisticsInfoDto.startAddressEn):''}} </view> -->
<view>{{$lang.lang.orderInfo.endCity}}：{{orderData.initialLogisticsInfoDto?($lang.locale=='zh'?(orderData.initialLogisticsInfoDto.destCountryTitleZh+'-'+(objectCity?objectCity.titleZh:'')+'-'+orderData.initialLogisticsInfoDto.destTitleZh):(orderData.initialLogisticsInfoDto.destCountryTitleEn+'-'+(objectCity?objectCity.titleEn:'')+'-'+orderData.initialLogisticsInfoDto.destTitleEn)):''}}</view>
</view>
......@@ -175,7 +175,7 @@
</view>
<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 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>
</view>
......@@ -186,7 +186,13 @@
<view class="order-info-line" >
<view class="order-info-line-v">
<view style="height: 36px;">{{$lang.lang.orderInfo.time}}：{{orderData.deliveryDate||$lang.lang.orderInfo.none}}</view>
<view style="height: 36px;" v-if="['3','4'].indexOf(orderData.transportId+'') > -1">{{$lang.lang.orderInfo.clearCard}}：{{orderData.customsClearCert?$lang.lang.orderInfo.is:$lang.lang.orderInfo.no}}</view>
<view style="height: 36px;" v-if="['3','4'].indexOf(orderData.transportId+'') > -1">
{{$lang.lang.orderInfo.clearCard}}：
<template v-if="orderData.customsClearCert !== null">
{{orderData.customsClearCert? $lang.lang.orderInfo.is : $lang.lang.orderInfo.no}}
</template>
<template v-else>-</template>
</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">
......@@ -194,7 +200,7 @@
<text>{{$lang.lang.orderInfo.estLoading}}:{{orderData.externalWarehousedtolist[0].estLoadingtime}}</text>
<text>{{$lang.lang.orderInfo.loadingAddress}}:{{orderData.externalWarehousedtolist[0].loadingAddress}}</text>
</view>
<view style="height: 36px;">{{$lang.lang.orderInfo.creator}}:{{orderData.creator}}</view>
<view style="height: 36px;">{{$lang.lang.orderInfo.creator}}:{{orderData.creatorName}}</view>
</view>
<view class="order-info-line-v">
<view style="height: 36px;">{{$lang.lang.orderInfo.levite}}：{{getConfigLabel('warehouseType',orderData.warehouseType)}}</view>
......@@ -202,7 +208,7 @@
<view style="height: 36px;" v-if="['3','4'].indexOf(orderData.transportId+'') > -1">{{$lang.lang.create.nowChange}}：{{orderData.isSingleTicketTransport?$lang.lang.create.is:$lang.lang.create.fou}}</view>
<view style="height: 36px;">{{$lang.lang.orderInfo.tidanPrice}}:{{orderData.displayBillLadingPrice?$lang.lang.orderInfo.show:$lang.lang.orderInfo.noShow}}</view>
<view style="height: 36px;">{{$lang.lang.create.quickNo}}:{{orderData.number}}</view>
<view style="height: 36px;">{{$lang.lang.orderInfo.createTime}}：{{orderData.createTime}}</view>
<view style="height: 36px;">{{$lang.lang.orderInfo.createTime}}：{{orderData.createTime|$parseTime}}</view>
</view>
</view>
</view>
......@@ -226,7 +232,7 @@
<view class="order-table" v-if="activeIndex==0&&orderData.orderItemVOList&&orderData.orderItemVOList.length>0">
<view style="width: 100%;" v-for="(item,index) in orderData.orderItemVOList" :key="index">
<view class="number_shop">{{parseInt(index)+1}}</view>
<view class="order-info-line" >
<view class="order-info-line" >
<view class="order-info-line-v">
<view class="order-table-v">
<text>{{$lang.lang.orderInfo.prodZh}}:{{item.prodTitleZh}}/{{item.prodTitleEn}}</text>
......@@ -235,7 +241,7 @@
<text>{{$lang.lang.orderInfo.formInfo}}:{{item.num}}{{$lang.lang.orderInfo.box}}{{item.weight}}KG{{item.volume}}m³{{item.quantity}}{{$lang.lang.create.aunit}}</text>
</view>
<view class="order-table-v">
<text>{{$lang.lang.orderInfo.works}}:{{item.worth}}</text>
<text>{{$lang.lang.orderInfo.works}}:{{item.worth}}RMB</text>
</view>
</view>
<view class="order-info-line-v">
......@@ -404,22 +410,22 @@
objectCity:'',
typeName:'',
packageTypeName:'',
basicShowMore:false,
shopShowMore:false
}
},
onLoad(options) {
let that = this
    uni.getSystemInfo({
         success: function (res) {
            that.tdWidth=res.windowWidth*0.72;
that.widowsWidth=res.windowWidth*0.72;
that.windowsHeight = res.windowHeight*0.8;
that.phoneHeight = res.windowHeight
that.phoneWidth = res.windowWidth
          }
    });
uni.getSystemInfo({
success: function (res) {
that.tdWidth=res.windowWidth*0.72;
that.widowsWidth=res.windowWidth*0.72;
that.windowsHeight = res.windowHeight*0.8;
that.phoneHeight = res.windowHeight
that.phoneWidth = res.windowWidth
}
});
this.getTreeList()
this.getcurrency()
this.orderConfig('transport_type', 'transport')
......@@ -500,7 +506,7 @@
}
if(res.data.packageType){
that.config.packageType.forEach(item=>{
if(res.data.packageType.includes(item.value)){
that.packageTypeName += that.$lang.locale=='zh'?item.label:item.labelEn
}
......@@ -872,4 +878,7 @@
<style>
@import url("../../static/css/orderInfo.css");
.corder-goods-v-item view text:nth-child(2){
line-height: unset;
}
</style>
src/static/css/create_order.css
View file @ 36fe1f67
......@@ -164,15 +164,22 @@ radio{
color: var(--c6);
font-size: var(--f24);
}
.corder-goods-v-item{
.corder-goods-v-item, .corder-goods-v-item2{
flex: 1;
margin-bottom: 20rpx;
}
.corder-goods-v-item view{
padding: 0;
}
.corder-goods-v-item2 view{
margin-bottom: 20rpx;
}
.corder-goods-v-item2 view:last-child{
margin-bottom: 0;
}
.corder-goods-v-item view text:nth-child(2){
color: var(--c-1);
line-height: 30px;
/*line-height: 30px;*/
}
.corder-bom{
width: 100%;
......
src/static/css/orderInfo.css
View file @ 36fe1f67
......@@ -208,6 +208,7 @@ page{
font-size: var(--f24);
color: var(--c3);
display: flex;
flex-wrap: wrap;
line-height: 70upx;
border-top-left-radius: 12upx;
border-top-right-radius: 12upx;
......@@ -219,9 +220,9 @@ page{
}
.twotext{
overflow: hidden;
text-overflow: ellipsis;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}
.order-table-v{
......@@ -348,5 +349,5 @@ page{
border-bottom: none;
margin-bottom: -20upx;
padding-left: 8rpx;
}
\ No newline at end of file
}
src/static/lang/zh/create.js
View file @ 36fe1f67
......@@ -82,7 +82,7 @@ export default {
"addressInfo": "收货详细地址",
"name": "姓名",
"nameEn": "英文名",
"choiceConsignee": "选择收货人",
"choiceConsignee": "收货人",
"phone": "电话",
"email": "邮箱",
"company": "公司名称",
......@@ -113,4 +113,4 @@ export default {
"cnotice5": "该货物有以上两种情况出现",
"overSeaWarehouseTips": "如需海外仓服务，请联系客服，服务热线：400-900-9962",
"other": "其他"
}
\ No newline at end of file
}
src/static/lang/zh/orderInfo.js
View file @ 36fe1f67
......@@ -16,7 +16,7 @@ export default {
"toRoom": "送货上门",
"consigneeCity": "收货地区",
"consigneeAdd": "收货地址",
"logistics": "物流信息",
"logistics": "运输",
"endCity": "目的仓",
"startCity": "始发仓",
"address": "地址",
......@@ -87,5 +87,6 @@ export default {
"createTime":"创建时间",
"inWarehouseInfo":"入仓信息",
"quickNos":"填单快递单号",
"unitType":"包装类型"
}
\ No newline at end of file
"unitType":"包装类型",
"is": "是"
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment