sunliwei/detection-business
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加检测第一步与最后一步需要上传图片

Browse Source
This commit is contained in:
许允枞 2024-11-07 18:03:10 +08:00
parent 0179515e11
commit 14c65eb517
1 changed files with 48 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
pages/index/orderdetails.vue
View File

@ -60,10 +60,10 @@
</view>
<view class="x-box">
<view class="h-title">订单详情</view>
<view class="on-input">
<view class="o-left">订单编号：</view>
<view class="o-right">{{ detailData.orderNo }}</view>
</view>
<!-- <view class="on-input">-->
<!-- <view class="o-left">订单编号：</view>-->
<!-- <view class="o-right">{{ detailData.orderNo }}</view>-->
<!-- </view>-->
<view class="on-input">
<view class="o-left">折扣：</view>
<view class="o-right">{{ detailData.reduceMoney / 100 }}</view>
@ -72,14 +72,14 @@
<view class="o-left">优惠金额：</view>
<view class="o-right">{{ detailData.couponDiscount / 100 }}</view>
</view>
<view class="on-input">
<view class="o-left">核销人：</view>
<view class="o-right">{{ detailData.validationRealName }}</view>
</view>
<view class="on-input">
<view class="o-left">核销时间：</view>
<view class="o-right">{{ detailData.validationTime }}</view>
</view>
<!-- <view class="on-input">-->
<!-- <view class="o-left">核销人：</view>-->
<!-- <view class="o-right">{{ detailData.validationRealName }}</view>-->
<!-- </view>-->
<!-- <view class="on-input">-->
<!-- <view class="o-left">核销时间：</view>-->
<!-- <view class="o-right">{{ detailData.validationTime }}</view>-->
<!-- </view>-->
<view class="bottomxx" v-if="isOnline&&isOnline==0&&orderStatus&&orderStatus==0" @click="xling = true">
<view class="">结算</view>
</view>
@ -105,7 +105,8 @@
</view>
<view class="annniu" v-if="detailData.status&&detailData.status == 0&&workNodeStatus == 1" @click="hge = true;getProject()">
<view class="annniu" v-if="detailData.status&&detailData.status == 0&&workNodeStatus == 1"
@click="hge = true;getProject()">
<view class="">结束检测</view>
</view>
<view class="annniu"
@ -115,7 +116,7 @@
</view>
<u-picker :show="show" :columns="columns" keyName="label" @close="close" @confirm="confirm" @change="change"
@cancel="cancel"></u-picker>
<u-popup :show="hge" @close="closehge" :round="10" @open="openxl">
<u-popup :show="hge" @close="closehge" :round="10" @open="openxl">
<view class="popup-box">
<view class="on-inputx">
<text>说明：</text>
@ -247,6 +248,7 @@ export default {
tbindex: 1,
isOnline: 1,
hge: false,
orImages:false,
show: false,
xling: false,
baseUrl: this.$baseUrl,
@ -267,7 +269,7 @@ export default {
shelist: [],
isPass: "1",
remark: '',
csId:'',
csId: '',
sfou: [{
text: '合格',
value: "1"
@ -336,10 +338,21 @@ export default {
params: {
inspectionId: this.inspectionId
}
}).then(res=>{
console.log('获取项目',res.data)
}).then(res => {
this.selectProject = res.data
console.log('项目', this.selectProject)
//查询当前是否是第一个节点或最后一个节点
let data = {
inspectionId: this.inspectionId,
workNodeId: this.workNodeId
}
request({
url: '/system/info/orImages',
method: 'get',
params: data
}).then(res => {
console.log('是否需要上传图片', res.data)
this.orImages = res.data
})
})
},
jisuan() {
@ -391,10 +404,10 @@ export default {
status = 3
} else if (this.tbindex == 1 && this.isRetrial == 1) {
console.log('这是重审')
if (this.csId == '' || this.csId == undefined){
if (this.csId == '' || this.csId == undefined) {
uni.showToast({
title:'请选择要返回的节点',
icon:'none'
title: '请选择要返回的节点',
icon: 'none'
})
return
}
@ -406,7 +419,17 @@ export default {
console.log('这是退办理')
status = 1
}
console.log('图片2', this.fileList2)
//判断当前节点是否需要上传图片
if (this.orImages) {
//判断是否有图片
if (this.fileList2.length == 0) {
uni.showToast({
title: '请上传图片',
icon: 'none'
})
return
}
}
let inspectionInfo = {
inspectionInfoId: this.inspectionInfoId,
isPass: this.isPass,
@ -1005,11 +1028,13 @@ image {
align-items: center;
justify-content: center;
}
.box_ {
width: 100%;
display: flex;
flex-wrap: wrap;
}
.box_button {
border-radius: 6px;
border: 1px solid #999;
@ -1022,6 +1047,7 @@ image {
margin-right: 5px;
margin-bottom: 5px;
}
.box_button_x {
border-radius: 6px;
border: 1px solid #0D2E8D;