wangpeng
/
integrated_traffic_uniapp
forked from integrated_whb/UniApp_integrated_whb
1
0
Fork 0
Code Pull Requests Activity

BUG优化 

行车 添加承诺选项
dev
xiepeng 2024-05-10 17:53:18 +08:00
parent eeb58ba02c
commit f756e12e71
3 changed files with 137 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pages/application/driving-inspections/driving-item-check-list.vue
View File

@ -61,7 +61,7 @@
</radio-group> </radio-group>
</view> </view>
</view> </view>
<view class="check-items"> <view class="check-items" v-if="CHECKTYPE_NAME !== '待承诺'">
<!-- <view class="cu-bar bg-white margin-top">--> <!-- <view class="cu-bar bg-white margin-top">-->
<!-- <view class="action">--> <!-- <view class="action">-->
<!-- 检查照片--> <!-- 检查照片-->
@ -83,7 +83,7 @@
<!-- </view>--> <!-- </view>-->
<!-- </view>--> <!-- </view>-->
<!-- </view>--> <!-- </view>-->
<view class="de-drawer" v-if="CHECKTYPE_NAME !== '待承诺'"> <view class="de-drawer">
<view class="bg-white"> <view class="bg-white">
<view class="action">实时照片</view> <view class="action">实时照片</view>
<view style="color: red;font-size: 10px">*照片说明：车辆正前方、左右两侧45°角及车尾部拍照</view> <view style="color: red;font-size: 10px">*照片说明：车辆正前方、左右两侧45°角及车尾部拍照</view>
@ -629,8 +629,6 @@
formData.WAYBILLSTATUS = 1 formData.WAYBILLSTATUS = 1
} else if (this.CHECKTYPE_NAME == "收车后") { } else if (this.CHECKTYPE_NAME == "收车后") {
formData.WAYBILLSTATUS = 2 formData.WAYBILLSTATUS = 2
}else if (this.CHECKTYPE_NAME == "待承诺"){
formData.WAYBILLSTATUS = 3
} }
formData.WAYBILLREGISTRATION_ID = this.WAYBILLREGISTRATION_ID formData.WAYBILLREGISTRATION_ID = this.WAYBILLREGISTRATION_ID
console.log(JSON.stringify(this.list)) console.log(JSON.stringify(this.list))
@ -681,12 +679,8 @@
return item.filePath return item.filePath
}).join(",") }).join(",")
formData.checklist = JSON.stringify(this.promiseList) formData.checklist = JSON.stringify(this.promiseList)
if (this.CHECKTYPE_NAME == "出车前" || this.CHECKTYPE_NAME == "行车中") { if (this.CHECKTYPE_NAME == "待承诺"){
formData.WAYBILLSTATUS = 1 formData.WAYBILLSTATUS = 0
} else if (this.CHECKTYPE_NAME == "收车后") {
formData.WAYBILLSTATUS = 2
}else if (this.CHECKTYPE_NAME == "待承诺"){
formData.WAYBILLSTATUS = 3
} }
formData.WAYBILLREGISTRATION_ID = this.WAYBILLREGISTRATION_ID formData.WAYBILLREGISTRATION_ID = this.WAYBILLREGISTRATION_ID
console.log(JSON.stringify(this.list)) console.log(JSON.stringify(this.list))

61
pages/application/driving-inspections/driving-item-detail.vue
View File

@ -97,7 +97,7 @@
</view> </view>
</view> </view>
</view> </view>
<view class="wui-form-list"> <!-- <view class="wui-form-list">
<view class="wui-sub-title"> <view class="wui-sub-title">
<text>行车安全问询</text> <text>行车安全问询</text>
</view> </view>
@ -106,14 +106,52 @@
<view class="cu-form-group">{{item.INQUIRYCONTENT}}</view> <view class="cu-form-group">{{item.INQUIRYCONTENT}}</view>
</view> </view>
</view> </view>
</view> </view>-->
<view class="wui-form-list"> <view class="wui-form-list">
<view class="wui-sub-title"> <view class="wui-sub-title">
<text>排查项</text> <text>排查项</text>
</view> </view>
</view> </view>
<view class="check-items" v-for="(item,index) in list" :key="item.CHECKTYPE_ID">
<view class="check-items" v-for="(item,index) in list2" :key="item.CHECKTYPE_ID">
<view class="wui-sub-title">行车安全问询:</view>
<view class="title" v-for="(item1,index1) in item.pd1Children" :key="index1">
<view class="title" v-for="(item2,index2) in commitmentList" :key="index2">
<view class="title" style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<text>承诺项:</text>
</view>
<view>
<view>{{ item2.INQUIRYCONTENT }}</view>
</view>
<view class="title" style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<text>承诺说明:</text>
</view>
<view>
<view>{{ item2.REMARK?item2.REMARK:'无' }}</view>
</view>
<view class="title" style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<text>是否合格:</text>
</view>
<view>{{item2.STATUS === '0'? "合格":item2.STATUS === '1'?"不合格": "不涉及"}}</view>
</view>
<view>
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group" >
<view class="title">检查人签字</view>
</view>
<view class="cu-item" style="border-bottom: 1px solid #e3e3e3">
<view class="imgs" style="display: flex;justify-content: space-between;align-items: flex-end;padding: 20upx 50upx;">
<image :src="baseImgPath + item1.SIGN_PATH" :data-index="index" @click="ViewShowImage(baseImgPath + item1.SIGN_PATH)"
mode="" style="width: 200upx;height: 200upx;"></image>
<text> {{item1.SIGN_TIME}}</text>
</view>
</view>
</view>
</view>
</view>
</view>
<view class="check-items" v-for="(item,index) in list" :key="item.CHECKTYPE_ID" v-if="item.CHECKTYPE_NAME !== '待承诺'">
<view class="wui-sub-title">{{item.CHECKTYPE_NAME}}检查：</view> <view class="wui-sub-title">{{item.CHECKTYPE_NAME}}检查：</view>
<view class="title" v-for="(item1,index1) in item.pd1Children" :key="index1"> <view class="title" v-for="(item1,index1) in item.pd1Children" :key="index1">
<view class="title" v-for="(item2,index2) in item1.pd2Children" :key="index2"> <view class="title" v-for="(item2,index2) in item1.pd2Children" :key="index2">
@ -129,11 +167,15 @@
<text>出车说明:</text> <text>出车说明:</text>
</view> </view>
<view>{{item2.REMARK?item2.REMARK:'无'}}</view> <view>{{item2.REMARK?item2.REMARK:'无'}}</view>
<view class="title" style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<text>是否合格:</text>
</view> </view>
<view>{{item2.STATUS === '0'? "合格":"不合格"}}</view>
</view>
<view> <view>
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee"> <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee" v-if="item.CHECKTYPE_NAME !== '待承诺'">
<view class="cu-form-group" > <view class="cu-form-group">
<view class="title">检查图片</view> <view class="title">检查图片</view>
</view> </view>
<view class="cu-item" style="border-bottom: 1px solid #e3e3e3"> <view class="cu-item" style="border-bottom: 1px solid #e3e3e3">
@ -160,11 +202,8 @@
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</scroll-view> </scroll-view>
</view> </view>
</template> </template>
@ -187,6 +226,7 @@
hs: [], hs: [],
files: [], files: [],
list:[], list:[],
list2:[],
commitmentList:[], commitmentList:[],
videoList: [], videoList: [],
checkList: [], checkList: [],
@ -238,7 +278,8 @@
_this.pd = res.data.pd; //参数map _this.pd = res.data.pd; //参数map
_this.commitmentList = res.data.commitmentList; //参数map _this.commitmentList = res.data.commitmentList; //参数map
_this.list = res.data.pd.varList _this.list = res.data.pd.varList
_this.list2 = res.data.pd.varList2
console.log(_this.list2)
} else if ("exception" == data.result) { } else if ("exception" == data.result) {
uni.showToast({ uni.showToast({
title: '错误', title: '错误',

78
pages/application/driving-inspections/driving-item-list.vue
View File

@ -13,7 +13,7 @@
'CHECKTYPE_NAME':item.CHECKTYPE_NAME, 'CHECKTYPE_NAME':item.CHECKTYPE_NAME,
'WAYBILLREGISTRATION_ID':WAYBILLREGISTRATION_ID,index})"> 'WAYBILLREGISTRATION_ID':WAYBILLREGISTRATION_ID,index})">
<view class="spot-img"> <view class="spot-img">
<image v-if="item.CHECKTYPE_NAME == '待承诺'" src="../../../static/driving_before.png" mode=""></image> <image v-if="item.CHECKTYPE_NAME == '待承诺'" src="../../../static/driving.png" mode=""></image>
<image v-if="item.CHECKTYPE_NAME == '出车前'" src="../../../static/driving_before.png" mode=""></image> <image v-if="item.CHECKTYPE_NAME == '出车前'" src="../../../static/driving_before.png" mode=""></image>
<image v-if="item.CHECKTYPE_NAME == '行车中'" src="../../../static/driving.png" mode=""></image> <image v-if="item.CHECKTYPE_NAME == '行车中'" src="../../../static/driving.png" mode=""></image>
<image v-if="item.CHECKTYPE_NAME == '收车后'" src="../../../static/driving_affter.png" mode=""></image> <image v-if="item.CHECKTYPE_NAME == '收车后'" src="../../../static/driving_affter.png" mode=""></image>
@ -105,34 +105,92 @@
//跳转事件 //跳转事件
goToList(e) { goToList(e) {
const index = e.index const index = e.index
const WAYBILLSTATUS = this.pd.WAYBILLSTATUS console.log(this.pd)
if((this.pd.WAYBILLSTATUS === '1' || this.pd.WAYBILLSTATUS === '2' || this.pd.IsExist != '0') && index === 1){ if ((this.pd.WAYBILLSTATUS === '3' || this.pd.IsExist == '0') && index === 1) {
uni.showModal({ uni.showModal({
title: '提示', title: '提示',
cancelText: '确认', cancelText: '确认',
confirmText: '取消', confirmText: '取消',
content:'您已经完成出车前检查，无需再次检查', content: '未进行出车前安全承诺，无法进行此操作',
}); });
return; return;
}else if((this.pd.WAYBILLSTATUS === '2' || this.pd.IsExist == '1' || this.pd.IsExist == '0') && index === 2){ }else if ((this.pd.WAYBILLSTATUS === '0' || this.pd.IsExist == '0') && index === 2) {
if(this.pd.WAYBILLSTATUS === '0') {
uni.showModal({ uni.showModal({
title: '提示', title: '提示',
content:'未进行出车前检查，无法进行此操作', cancelText: '确认',
confirmText: '取消',
content: '未进行出车前检查，无法进行此操作',
});
return;
}else if ((this.pd.WAYBILLSTATUS === '0' || this.pd.WAYBILLSTATUS === '1' || this.pd.WAYBILLSTATUS === '2') && index === 0) {
uni.showModal({
title: '提示',
cancelText: '确认',
confirmText: '取消',
content: '您已经完成出车前安全承诺，无需再次承诺',
});
return;
}else if ((this.pd.WAYBILLSTATUS === '1' || this.pd.WAYBILLSTATUS === '2' || this.pd.WAYBILLSTATUS === '2') && index === 1) {
uni.showModal({
title: '提示',
cancelText: '确认',
confirmText: '取消',
content: '您已经完成出车前检查，无需再次检查',
});
return;
}else if ((this.pd.WAYBILLSTATUS === '2') && index === 2) {
uni.showModal({
title: '提示',
cancelText: '确认',
confirmText: '取消',
content: '您已经完成行车中检查，无需再次检查',
});
return;
}else if ((this.pd.WAYBILLSTATUS === '0') && index === 3) {
uni.showModal({
title: '提示',
cancelText: '确认',
confirmText: '取消',
content: '您未进行行车中检查，请按顺序检查',
});
return;
}else if ((this.pd.WAYBILLSTATUS === '3') && index === 3) {
uni.showModal({
title: '提示',
cancelText: '确认',
confirmText: '取消',
content: '您未进行行车中检查，请按顺序检查',
});
return;
}
/* if ((this.pd.WAYBILLSTATUS === '2' || this.pd.WAYBILLSTATUS === '3' || this.pd.IsExist != '0') && index === 1) {
uni.showModal({
title: '提示',
cancelText: '确认',
confirmText: '取消',
content: '您已经完成出车前检查，无需再次检查',
});
return;
} else if ((this.pd.WAYBILLSTATUS === '2' || this.pd.IsExist == '1' || this.pd.IsExist == '0') && index === 2) {
if (this.pd.WAYBILLSTATUS === '0') {
uni.showModal({
title: '提示',
content: '未进行出车前检查，无法进行此操作',
showCancel: false, showCancel: false,
confirmText: '确认' confirmText: '确认'
}); });
} }
return return
}else if((this.pd.WAYBILLSTATUS === '2' || this.pd.IsExist == '2' || this.pd.IsExist == '0') && index === 3){ } else if ((this.pd.WAYBILLSTATUS === '2' || this.pd.IsExist == '2' || this.pd.IsExist == '0') && index === 3) {
uni.showModal({ uni.showModal({
title: '提示', title: '提示',
cancelText: '确认', cancelText: '确认',
confirmText: '取消', confirmText: '取消',
content:'您未进行行车中检查，请按顺序检查', content: '您未进行行车中检查，请按顺序检查',
}); });
return; return;
} }*/
uni.navigateTo({ uni.navigateTo({
url: '/pages/application/driving-inspections/driving-item-check-list?CHECKTYPE_ID=' + url: '/pages/application/driving-inspections/driving-item-check-list?CHECKTYPE_ID=' +
e.CHECKTYPE_ID + '&CHECKTYPE_NAME=' + e.CHECKTYPE_NAME + '&WAYBILLREGISTRATION_ID=' + e.WAYBILLREGISTRATION_ID e.CHECKTYPE_ID + '&CHECKTYPE_NAME=' + e.CHECKTYPE_NAME + '&WAYBILLREGISTRATION_ID=' + e.WAYBILLREGISTRATION_ID