|
|
@@ -19,7 +19,7 @@
|
|
|
<view class="transaction">
|
|
|
<u-form :model="list" ref="list" class="uForm">
|
|
|
<u-form-item label="任务类型" prop="contractNo" label-width="140">
|
|
|
- 销售转移
|
|
|
+ <view style='text-align:right;width: 100%;color:#000;min-height: 70rpx;line-height: 70rpx;'> 销售转移</view>
|
|
|
</u-form-item>
|
|
|
</u-form>
|
|
|
<view style='margin-left:20rpx;font-weight:600;'>基本信息</view>
|
|
|
@@ -54,12 +54,12 @@
|
|
|
<view class="">{{item.tranTaskOld?item.tranTaskOld:'他运无运输任务'}}</view>
|
|
|
</view>
|
|
|
<view style='align-items: center;justify-content: space-between;margin:10rpx 20rpx;' class='flex '>
|
|
|
- <view v-if='item.tranTaskOld'>原运费{{item.tranPriceOld}}元/吨</view>
|
|
|
+ <view v-if='item.tranTaskOld'>原运费{{item.tranPriceOld}}{{item.billingMethod==1?'元/吨':'元/车'}}</view>
|
|
|
<view v-else> </view>
|
|
|
<view style='align-items: center;' class='flex ' v-if='list.tranTaskNew'>
|
|
|
新运费
|
|
|
<u-input :style='!editstatus?"":"border-bottom:1px solid #ccc;"' style='width:200rpx;margin:0 4rpx;padding-right:10rpx;' v-model="item.tranPrice" input-align="right" placeholder="" :disabled='!editstatus' />
|
|
|
- <text>{{item.billingMethod==1?'元/吨':'元/车'}}</text> <u-icon @click='downchange(index)' name="arrow-down-fill" color="#000" size="28"></u-icon>
|
|
|
+ <text>{{item.billingMethod==1?'元/吨':'元/车'}}</text> <u-icon @click='downchange(index)' name="arrow-down-fill" color="#000" size="24"></u-icon>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -109,6 +109,11 @@
|
|
|
<view v-if='item.auditMind' class="right-content">
|
|
|
{{item.auditMind}}
|
|
|
</view>
|
|
|
+ <view class="flex audit_img">
|
|
|
+ <view v-for="(items,indexs) in item.fileUrl" class="url_css">
|
|
|
+ <image :src="items" imageMode='aspectFill' class="url_img" @click="auditFile(items)"></image>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
</view>
|
|
|
<view v-if='item.commonStaffs1' class="right">
|
|
|
<u-icon @click='showcontent(item)' :name="item.showflow?'arrow-up':'arrow-down'" size="28">
|
|
|
@@ -158,15 +163,15 @@
|
|
|
<view @click='passSubmit()' class="confirm">确定</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
- <u-popup mode='center' :border-radius='10' :closeable='true' :width='"400"' :height='"200"' v-model="show1">
|
|
|
- <view style='margin:50rpx 0 0 20rpx;'>
|
|
|
- <u-radio-group @change='radiochange' v-model="value">
|
|
|
- <u-radio name='1' shape="circle">元/吨</u-radio>
|
|
|
- <u-radio name='2' shape="circle">元/车</u-radio>
|
|
|
- </u-radio-group>
|
|
|
+
|
|
|
+ <u-modal :show-cancel-button='true' confirm-color='#19be6b' title='选择单位' v-model="show1" >
|
|
|
+ <view style='text-align:center;padding:30rpx 20rpx;' class="slot-content">
|
|
|
+ <u-radio-group active-color="#19be6b" @change='radiochange' v-model="value">
|
|
|
+ <u-radio name='1' shape="circle">元/吨</u-radio>
|
|
|
+ <u-radio name='2' shape="circle">元/车</u-radio>
|
|
|
+ </u-radio-group>
|
|
|
</view>
|
|
|
-
|
|
|
- </u-popup>
|
|
|
+ </u-modal>
|
|
|
<view v-if='list.taskId' style='padding:10px;z-index: 12;' class='flex bottom-btn'>
|
|
|
<u-button v-if='list.approveStatus||isSHowBtn' @click='reject' type="error" class="btn1" hover-class='none'>
|
|
|
驳回
|
|
|
@@ -226,6 +231,21 @@
|
|
|
...mapState(['hasLogin', 'userInfo']),
|
|
|
},
|
|
|
methods: {
|
|
|
+ auditFile(src) {
|
|
|
+ uni.downloadFile({
|
|
|
+ url: src,
|
|
|
+ success: function(res) {
|
|
|
+ var filePath = res.tempFilePath;
|
|
|
+ uni.openDocument({
|
|
|
+ filePath: filePath,
|
|
|
+ showMenu: true,
|
|
|
+ success: function(res) {
|
|
|
+ console.log('打开文档成功');
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
+ });
|
|
|
+ },
|
|
|
downchange(index){
|
|
|
if(this.editstatus){
|
|
|
this.index=index
|
|
|
@@ -289,6 +309,11 @@
|
|
|
title: '加载中',
|
|
|
mask: true
|
|
|
});
|
|
|
+ if(this.list.tranCarInfoList){
|
|
|
+ for (var i = 0; i < this.list.tranCarInfoList.length; i++) {
|
|
|
+ this.list.tranCarInfoList[i].tranPrice=Number(this.list.tranCarInfoList[i].tranPrice)
|
|
|
+ }
|
|
|
+ }
|
|
|
if(this.editstatus){
|
|
|
await that.$api.doRequest('post', '/salesTransferInfo/api/editInfo', {
|
|
|
id:this.list.id,
|
|
|
@@ -333,7 +358,7 @@
|
|
|
this.$api.msg('运费输入错误')
|
|
|
return
|
|
|
}
|
|
|
- if(this.list.tranCarInfoList[i].tranPrice.indexOf('.')!=-1&&this.list.tranCarInfoList[i].tranPrice.split('.')[1].length>2){
|
|
|
+ if(String(this.list.tranCarInfoList[i].tranPrice).indexOf('.')!=-1&&String(this.list.tranCarInfoList[i].tranPrice).split('.')[1].length>2){
|
|
|
this.$api.msg('运费输入错误')
|
|
|
return
|
|
|
}
|
|
|
@@ -354,7 +379,7 @@
|
|
|
this.$api.msg('运费输入错误')
|
|
|
return
|
|
|
}
|
|
|
- if(this.list.tranCarInfoList[i].tranPrice.indexOf('.')!=-1&&this.list.tranCarInfoList[i].tranPrice.split('.')[1].length>2){
|
|
|
+ if(String(this.list.tranCarInfoList[i].tranPrice).indexOf('.')!=-1&&String(this.list.tranCarInfoList[i].tranPrice).split('.')[1].length>2){
|
|
|
this.$api.msg('运费输入错误')
|
|
|
return
|
|
|
}
|
|
|
@@ -455,8 +480,12 @@
|
|
|
.getTime()
|
|
|
response.data.data[i].updateDate = this.$u.timeFormat(
|
|
|
time, 'mm.dd hh:MM')
|
|
|
- response.data.data[i].auditMind = response.data.data[i]
|
|
|
- .workflowHistoricTasks[len].auditMind
|
|
|
+ if (response.data.data[i].workflowHistoricTasks[len].auditMind && response.data.data[i].workflowHistoricTasks[len].auditMind.indexOf("##") !=-1) {
|
|
|
+ response.data.data[i].auditMind = response.data.data[i].workflowHistoricTasks[len].auditMind.split("##")[0]
|
|
|
+ response.data.data[i].fileUrl = response.data.data[i].workflowHistoricTasks[len].auditMind.split("##")[1].split(",")
|
|
|
+ }else{
|
|
|
+ response.data.data[i].auditMind = response.data.data[i].workflowHistoricTasks[len].auditMind
|
|
|
+ }
|
|
|
} else {
|
|
|
this.$set(response.data.data[i], 'status', 'question')
|
|
|
// response.data.data[i].status='question'
|
|
|
@@ -507,18 +536,21 @@
|
|
|
workflowHistoricTasks: [],
|
|
|
status: 'success'
|
|
|
})
|
|
|
+ for (var i = 0; i < this.list.tranCarInfoList.length; i++) {
|
|
|
+ if(!this.list.tranCarInfoList[i].billingMethod){
|
|
|
+ this.list.tranCarInfoList[i].billingMethod=1
|
|
|
+ }
|
|
|
+ if(this.editstatus){
|
|
|
+ if(this.list.tranCarInfoList[i].tranPriceOld&&this.list.tranCarInfoList[i].tranPriceOld!=0){
|
|
|
+ this.list.tranCarInfoList[i].tranPrice=this.list.tranCarInfoList[i].tranPriceOld
|
|
|
+ }
|
|
|
+ }else{
|
|
|
+ this.list.tranCarInfoList[i].tranPrice= Number(this.list.tranCarInfoList[i].tranPrice).toFixed(2)
|
|
|
+ }
|
|
|
+ }
|
|
|
})
|
|
|
})
|
|
|
- for (var i = 0; i < this.list.tranCarInfoList.length; i++) {
|
|
|
- if(!this.list.tranCarInfoList[i].billingMethod){
|
|
|
- this.list.tranCarInfoList[i].billingMethod=1
|
|
|
- }
|
|
|
- if(this.editstatus){
|
|
|
- this.list.tranCarInfoList[i].tranPrice=this.list.tranCarInfoList[i].tranPriceOld
|
|
|
- }else{
|
|
|
- this.list.tranCarInfoList[i].tranPrice= Number(this.list.tranCarInfoList[i].tranPrice).toFixed(2)
|
|
|
- }
|
|
|
- }
|
|
|
+
|
|
|
})
|
|
|
},
|
|
|
}
|
|
|
@@ -719,6 +751,27 @@
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ .audit_img {
|
|
|
+ flex-wrap: wrap;
|
|
|
+ // margin: 0 10rpx;
|
|
|
+ margin-left: 20rpx;
|
|
|
+
|
|
|
+ .url_css {
|
|
|
+ border: 1px solid #999999;
|
|
|
+ border-radius: 10px;
|
|
|
+ margin-top: 10px;
|
|
|
+ margin-right: 4px;
|
|
|
+ overflow: hidden;
|
|
|
+ width: 73px;
|
|
|
+ height: 73px;
|
|
|
+
|
|
|
+ .url_img {
|
|
|
+ width: 73px;
|
|
|
+ height: 73px;
|
|
|
+ // border-radius: 10px;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -896,4 +949,20 @@
|
|
|
color: #00C265;
|
|
|
}
|
|
|
}
|
|
|
+ /deep/.u-radio-group{
|
|
|
+ display: flex;
|
|
|
+ justify-content: space-around;
|
|
|
+ width:90%;
|
|
|
+ margin:0 auto;
|
|
|
+ }
|
|
|
+ /deep/.u-radio:first-child{
|
|
|
+ margin-left:60rpx;
|
|
|
+ }
|
|
|
+ /deep/.u-radio:last-child{
|
|
|
+ text-align: right;
|
|
|
+ // margin-left:auto;
|
|
|
+ .u-radio__label{
|
|
|
+ margin-right:0;
|
|
|
+ }
|
|
|
+ }
|
|
|
</style>
|
