Commit d7074877 authored by 李超鹏's avatar 李超鹏

type:update

scope:self
body:修改bug
parent e3c3d707
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
<view class="img-list"> <view class="img-list">
<u-image class="pic" width="160rpx" height="160rpx" :border-radius="10" @click="selectUpload" :src="uploadImage"></u-image> <u-image class="pic" width="160rpx" height="160rpx" :border-radius="10" @click="selectUpload" :src="uploadImage"></u-image>
</view> </view>
<!-- <u-image class="pic" v-for="item in 6" width="170rpx" height="170" src="'https://cdn.uviewui.com/uview/example/fade.jpg"></u-image> -->
</view> </view>
<u-action-sheet :list="list" v-model="maskShow" :cancel-btn="true" @click="uploadSelect"></u-action-sheet> <u-action-sheet :list="list" v-model="maskShow" :cancel-btn="true" @click="uploadSelect"></u-action-sheet>
</view> </view>
...@@ -118,16 +117,14 @@ ...@@ -118,16 +117,14 @@
return return
} }
// 使用拍照工具拍摄 // 使用拍照工具拍摄
this.takeStatus = true this.photograph()
this.getWatermark() this.getWatermark()
this.getPhotoStander()
}, },
setValue() { setValue() {
const dataValue = [] const dataValue = []
this.imgList.map(item=>{ this.imgList.map(item=>{
dataValue.push(item.src) dataValue.push(item.src)
}) })
console.log("dataValue", dataValue)
this.valueChange(dataValue) this.valueChange(dataValue)
}, },
closeTake(val) { closeTake(val) {
...@@ -151,7 +148,7 @@ ...@@ -151,7 +148,7 @@
this.imgList.splice(index, 1) this.imgList.splice(index, 1)
this.setValue() this.setValue()
}, },
getPhotoStander(){// 获取拍照规范接口 photograph(){// 获取拍照规范接口
let self = this let self = this
let param = {"partnerCompanyId":self.partnerCompanyId, let param = {"partnerCompanyId":self.partnerCompanyId,
"categoryId":self.categoryId, "categoryId":self.categoryId,
...@@ -160,6 +157,7 @@ ...@@ -160,6 +157,7 @@
this.$u.api.orderStandardItem(param).then((res)=>{ this.$u.api.orderStandardItem(param).then((res)=>{
if (res.code == 200 && res.data.length>0) { if (res.code == 200 && res.data.length>0) {
self.currentItemDate = res.data[0] self.currentItemDate = res.data[0]
self.takeStatus = true
}else{ }else{
console.log("获取完工项的拍照标准异常",res.data.message) console.log("获取完工项的拍照标准异常",res.data.message)
} }
......
...@@ -87,14 +87,11 @@ ...@@ -87,14 +87,11 @@
<view> <view>
<text>{{record.operationTypeText}}</text> <text>{{record.operationTypeText}}</text>
<text style="color: red;">{{record.overTime?'(超时)':''}}{{record.exception?'(异常)':''}}</text> <text style="color: red;">{{record.overTime?'(超时)':''}}{{record.exception?'(异常)':''}}</text>
<text style="color: #2272FF;" v-show="record.operationType==='报备'">(跟进)</text> <text style="color: #2272FF;" v-show="record.operationType==='报备' || record.operationType==='改约'">(跟进)</text>
</view> </view>
<view v-show="record.operationType==='报备' || record.operationType==='预约'|| record.operationType==='改约'"> <view v-show="record.operationType==='报备' || record.operationType==='预约'|| record.operationType==='改约'">
<text>{{record.operationType==='报备' ? '下次联系时间:' : record.operationType==='改约'?'改约时间:': ''}}</text> <text>{{record.operationType==='报备' ? '下次联系时间:' : record.operationType==='改约'?'改约时间:': ''}}</text>
<text style="color: #2272FF;">{{ <text style="color: #2272FF;">{{record.orderRecordRemark}}</text>
record.operationType==='报备' && record.orderRecordRemark && record.orderRecordRemark.length>1?
record.orderRecordRemark.substring(record.orderRecordRemark.indexOf(':')+1,record.orderRecordRemark.length)
:record.orderRecordRemark}}</text>
</view> </view>
</view> </view>
</view> </view>
...@@ -429,9 +426,12 @@ ...@@ -429,9 +426,12 @@
res.data.forEach(item =>{ res.data.forEach(item =>{
if(item.operationType === '预约'){ if(item.operationType === '预约'){
item.operationTypeText = '上门时间' item.operationTypeText = '上门时间'
}else if (item.operationType === '报备'){ }else if (item.operationType === '报备' || item.operationType === '改约'){
let arr = item.orderRecordRemark.split(',') let arr = item.orderRecordRemark.split(',')
item.operationTypeText = arr[0] item.operationTypeText = arr[0]
if(arr.length > 1){
item.orderRecordRemark = arr[1].substring(arr[1].indexOf(':')+1,arr[1].length)
}
}else{ }else{
item.operationTypeText = item.operationType + '时间' item.operationTypeText = item.operationType + '时间'
} }
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<!-- <text class="rightContent u-m-t-14 u-m-l-30 u-p-b-30">{{item.describe}}</text> --> <!-- <text class="rightContent u-m-t-14 u-m-l-30 u-p-b-30">{{item.describe}}</text> -->
</view> </view>
<view class="rightImageView" v-if="item.orderImages && item.orderImages.length > 0"> <view class="rightImageView" v-if="item.orderImages && item.orderImages.length > 0">
<image class="rightImage" v-for="(image, index) in item.orderImages.slice(0 , 10)" :src="image" <image class="rightImage" v-for="(image, index) in item.orderImages" :src="image"
:key="index" @click.stop="handleClickImage(item, index)" mode="aspectFill"></image> :key="index" @click.stop="handleClickImage(item, index)" mode="aspectFill"></image>
</view> </view>
</view> </view>
......
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