|
|
@@ -20,18 +20,10 @@
|
|
|
</view> -->
|
|
|
<view class="content1">
|
|
|
<view class="row" @click="selectCargoOwner">
|
|
|
-<<<<<<< HEAD
|
|
|
- <view class="left select-sf" :class='dataObj.cargoOwner?"":"select-sf1"'>
|
|
|
- {{dataObj.cargoOwner?dataObj.cargoOwner:'选择货主身份'}}
|
|
|
- </view>
|
|
|
- <view class="right">
|
|
|
- <image src="../../static/images/myimg/gengduo1.png"
|
|
|
- style="width: 20rpx;height: 26rpx;margin-top:14rpx;"></image>
|
|
|
- </view>
|
|
|
-=======
|
|
|
+
|
|
|
<view class="left select-sf" :class='dataObj.cargoOwner?"":"select-sf1"'>{{dataObj.cargoOwner?dataObj.cargoOwner:'选择货主身份'}}</view>
|
|
|
<view class="right"><image src="../../static/right.png" style="width: 22rpx;height: 22rpx;margin-top:14rpx;"></image></view>
|
|
|
->>>>>>> bd3e419a29e86c8d553f6270e7cdfa8729b85b15
|
|
|
+
|
|
|
</view>
|
|
|
<!-- <view class="row" @click="selectCargoOwner" v-if="dataObj.cargoOwner">
|
|
|
<view class="left">{{dataObj.cargoOwner}}</view>
|
|
|
@@ -55,14 +47,8 @@
|
|
|
</view>
|
|
|
<view class="right" @click="selectAddress(0)" v-if="!dataObj.sendArea">
|
|
|
<view v-if='dataObj.sendArea' class="right"></view>
|
|
|
-<<<<<<< HEAD
|
|
|
- <view class="right" v-else>
|
|
|
- <image src="../../static/images/myimg/gengduo1.png"
|
|
|
- style="width: 20rpx;height: 26rpx;margin-top:14rpx;"></image>
|
|
|
- </view>
|
|
|
-=======
|
|
|
+
|
|
|
<view class="right" v-else><image src="../../static/right.png" style="width: 22rpx;height: 22rpx;margin-top:14rpx;"></image></view>
|
|
|
->>>>>>> bd3e419a29e86c8d553f6270e7cdfa8729b85b15
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class="row2">
|
|
|
@@ -79,14 +65,8 @@
|
|
|
</view>
|
|
|
<view class="right" @click="selectAddress(1)" v-if="!dataObj.unloadArea">
|
|
|
<view v-if='dataObj.unloadArea' class="right">{{(dataObj.unloadCity+dataObj.unloadArea)}}</view>
|
|
|
-<<<<<<< HEAD
|
|
|
- <view class="right" v-else>
|
|
|
- <image src="../../static/images/myimg/gengduo1.png"
|
|
|
- style="width: 20rpx;height: 26rpx;margin-top:14rpx;"></image>
|
|
|
- </view>
|
|
|
-=======
|
|
|
+
|
|
|
<view class="right" v-else><image src="../../static/right.png" style="width: 22rpx;height: 22rpx;margin-top:14rpx;"></image></view>
|
|
|
->>>>>>> bd3e419a29e86c8d553f6270e7cdfa8729b85b15
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -97,6 +77,10 @@
|
|
|
{{dataObj.distance }}
|
|
|
km
|
|
|
</view>
|
|
|
+ <view class="row">
|
|
|
+ <view class="left">货物类别</view>
|
|
|
+ <view class="right" @click="goodstypeChange">{{dataObj.goodsType?dataObj.goodsType:"请选择货物类别"}}</view>
|
|
|
+ </view>
|
|
|
<view class="row">
|
|
|
<view class="left">货名</view>
|
|
|
<view class="right"><input type="text" class="input" value="" placeholder="输入货物名称"
|
|
|
@@ -253,6 +237,10 @@
|
|
|
<u-picker :show="isShowValidity" ref="uPicker" :columns="validityPeriod" @confirm="confirmValidityPeriod"
|
|
|
:closeOnClickOverlay='true' @close='isShowValidity=false' @cancel='isShowValidity=false'>
|
|
|
</u-picker>
|
|
|
+ <!-- //货物类别 -->
|
|
|
+ <u-picker :show="isGoodsType" ref="uPicker" :columns="goodsList" keyName="constValue" @confirm="goodsSubmit"
|
|
|
+ :closeOnClickOverlay='true' @close='isGoodsType=false' @cancel='isGoodsType=false'>
|
|
|
+ </u-picker>
|
|
|
<u-modal :show="isShowAlert" :title="alertTitle" :content='alertContent' :closeOnClickOverlay='false'
|
|
|
:showCancelButton='showCancelButton' confirmColor='#2772FB' @confirm="confirmClick" @close="cancelClick"
|
|
|
@cancel="cancelClick"></u-modal>
|
|
|
@@ -358,6 +346,9 @@
|
|
|
},
|
|
|
|
|
|
],
|
|
|
+ // 货物类别
|
|
|
+ isGoodsType:false,
|
|
|
+ goodsList:[]
|
|
|
}
|
|
|
},
|
|
|
onNavigationBarButtonTap(e) {
|
|
|
@@ -393,14 +384,6 @@
|
|
|
let _obj = res.data
|
|
|
if (_obj.authenticationStatus == '已认证') {
|
|
|
uni.$u.route('/pages/components/empty/index');
|
|
|
-<<<<<<< HEAD
|
|
|
- } else if (_obj.authenticationStatus == '审核中') {
|
|
|
- uni.showToast({
|
|
|
- title: '身份信息审核中',
|
|
|
- icon: 'none'
|
|
|
- })
|
|
|
-=======
|
|
|
->>>>>>> bd3e419a29e86c8d553f6270e7cdfa8729b85b15
|
|
|
} else if (_obj.authenticationStatus == '已过期') {
|
|
|
this.alertTitle = '身份信息已过期！'
|
|
|
this.showCancelButton = false
|
|
|
@@ -452,8 +435,17 @@
|
|
|
this.dataObj.loadingDateEnd = '随时'
|
|
|
this.dataObj.taskValidity = '长期'
|
|
|
this.getSFList()
|
|
|
+
|
|
|
},
|
|
|
async onLoad() {
|
|
|
+ //货物类别(默认上一次)
|
|
|
+ this.queryGoodsList() // 查询货物类别
|
|
|
+ let goods = uni.getStorageSync("goodsType")
|
|
|
+ if(goods){
|
|
|
+ this.dataObj.goodsType = goods.name
|
|
|
+ this.dataObj.goodsTypeKey = goods.key
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
// _this = this
|
|
|
// // #ifdef APP-PLUS
|
|
|
@@ -479,6 +471,27 @@
|
|
|
...mapState(['hasLogin', 'userInfo']),
|
|
|
},
|
|
|
methods: {
|
|
|
+ queryGoodsList(){
|
|
|
+ this.$request.baseRequest('get', '/commonSysParameter/getInfo', {
|
|
|
+ constId: "CON1"
|
|
|
+ }).then(res => {
|
|
|
+ this.goodsList.push(res.data)
|
|
|
+ console.log(this.goodsList)
|
|
|
+ })
|
|
|
+ },
|
|
|
+ goodstypeChange(){
|
|
|
+ this.isGoodsType = true
|
|
|
+ },
|
|
|
+ goodsSubmit(e){
|
|
|
+ this.dataObj.goodsType = e.value[0].constValue
|
|
|
+ this.dataObj.goodsTypeKey = e.value[0].constKey
|
|
|
+ let _obj={
|
|
|
+ name:e.value[0].constValue,
|
|
|
+ key:e.value[0].constKey
|
|
|
+ }
|
|
|
+ uni.setStorageSync("goodsType",_obj)
|
|
|
+ this.isGoodsType = false
|
|
|
+ },
|
|
|
getSFList() {
|
|
|
this.dataObj.commonId = this.userInfo.id
|
|
|
this.$request.baseRequest('get', '/cargoOwnerCompInfo/cargoOwnerList', {
|
|
|
@@ -805,6 +818,7 @@
|
|
|
// uni.$u.route("/pages/release/record")
|
|
|
}
|
|
|
})
|
|
|
+ this.isShowAlert = false
|
|
|
|
|
|
})
|
|
|
.catch(res => {
|
zhongtianhaoyuan