This commit is contained in:
许允枞 2024-11-04 18:06:24 +08:00
parent 075b14bf22
commit a7e9e00e63
2 changed files with 446 additions and 371 deletions

View File

@ -227,6 +227,7 @@
geindex: 0, geindex: 0,
detailData: {}, detailData: {},
inspectionInfoId: '', inspectionInfoId: '',
workNodeId:'',
stepInfo: { stepInfo: {
isPass: "0" isPass: "0"
}, },
@ -260,6 +261,7 @@
}, },
onLoad(option) { onLoad(option) {
this.inspectionInfoId = option.inspectionInfoId this.inspectionInfoId = option.inspectionInfoId
this.workNodeId = option.workNodeId
}, },
onShow() { onShow() {
@ -339,14 +341,28 @@
}); });
}, },
async submit() { async submit() {
console.log('isPass',this.isPass);
console.log('geindex',this.geindex)
let status = 0
if (this.isPass == '1') {
status = 3
}else{
if (this.geindex == 1) {
status = 2
}else{
status = 1
}
}
let inspectionInfo = { let inspectionInfo = {
id: this.inspectionInfoId, inspectionInfoId: this.inspectionInfoId,
isPass: this.isPass, isPass: this.isPass,
isRetrial: this.isRetrial, id: this.workNodeId,
selectType: status,
remark: this.remark remark: this.remark
} }
let res = await request({ let res = await request({
url: '/partnerOwn/partner/stopInspection', // url: '/partnerOwn/partner/stopInspection',
url: '/system/info/controls',
method: 'post', method: 'post',
data: inspectionInfo data: inspectionInfo
}) })
@ -452,10 +468,14 @@
Nnimamadewen(value, index) { Nnimamadewen(value, index) {
this.isPass = value this.isPass = value
this.geindex = index this.geindex = index
console.log('this.isPass', this.isPass)
console.log('this.geindex', this.geindex)
}, },
shenmowanyi(value, index) { shenmowanyi(value, index) {
this.tbindex = value this.tbindex = value
this.isRetrial = value this.isRetrial = value
console.log('this.tbindex', this.tbindex)
console.log('this.isRetrial', this.isRetrial)
}, },
closexl(e) { closexl(e) {
this.xling = false this.xling = false
@ -924,4 +944,4 @@
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
</style> </style>

View File

@ -1,376 +1,431 @@
<!-- 订单管理 --> <!-- 订单管理 -->
<template> <template>
<view class="content"> <view class="content">
<view style="width: 100%; height: 55px;"></view> <view style="width: 100%; height: 55px;"></view>
<view class="top-heder"> <view class="top-heder">
<!-- <view class="t-left" @click="getfan()"> <!-- <view class="t-left" @click="getfan()">
<uni-icons type="left" size="18"></uni-icons> <uni-icons type="left" size="18"></uni-icons>
</view> --> </view> -->
<view class="t-input"> <view class="t-input">
<uni-icons type="search" color="#BCBCBC" size="22"></uni-icons> <uni-icons type="search" color="#BCBCBC" size="22"></uni-icons>
<input type="text" v-model="carNum" placeholder="搜索车牌号....."> <input type="text" v-model="carNum" placeholder="搜索车牌号.....">
</view> </view>
<view class="sou" @click="getList()">搜索</view> <view class="sou" @click="getList()">搜索</view>
</view> </view>
<view class="tap"> <view class="tap">
<view class="tap-box" v-for="(item,index) in tapList" :key="index" @click="tapqh(index)"> <view class="tap-box" v-for="(item,index) in tapList" :key="index" @click="tapqh(index)">
<view class="xhuihui" :class="{'xzhei':tapindex == index}">{{item.text}}</view> <view class="xhuihui" :class="{'xzhei':tapindex == index}">{{ item.text }}</view>
<view class="gang" v-if="tapindex == index"></view> <view class="gang" v-if="tapindex == index"></view>
</view> </view>
</view> </view>
<view class="mub"> <view class="mub">
<view class="top-ail" > <view class="top-ail">
<view class="jsy" v-if="infoDatas.length == 0"> <view class="jsy" v-if="infoDatas.length == 0">
<image src="http://www.nuoyunr.com/lananRsc/detection/qs.png" mode=""></image> <image src="http://www.nuoyunr.com/lananRsc/detection/qs.png" mode=""></image>
</view> </view>
<view class="m-box" v-for="(item,index) in infoDatas" :key="index"> <view class="m-box" v-for="(item,index) in infoDatas" :key="index">
<view class="sshi" v-if="item.isPass == '0'"> <view class="sshi" v-if="item.isPass == '0'">
<image v-if="!item.isRetrial||item.isRetrial == 0" :src="imgurl + '/noPass.png'" mode=""></image> <image v-if="!item.isRetrial||item.isRetrial == 0" :src="imgurl + '/noPass.png'" mode=""></image>
<view v-else class=""> <view v-else class="">
<text>重审中</text> <text>重审中</text>
</view> </view>
</view> </view>
<view class="sshi" v-if="item.isPass == '1'"> <view class="sshi" v-if="item.isPass == '1'">
<image :src="imgurl + '/pass.png'" mode=""></image> <image :src="imgurl + '/pass.png'" mode=""></image>
</view> </view>
<view class="m-top"> <view class="m-top">
<view class="top-left"> <view class="top-left">
<view class="dhei">{{item.goodsName}}</view> <view class="dhei">{{ item.goodsName }}</view>
<text class="xhui">接待员{{item.workerName}}</text> <text class="xhui">接待员{{ item.workerName }}</text>
</view> </view>
<view @click="callUser(item.buyPhone)" class="top-right"> <view @click="callUser(item.buyPhone)" class="top-right">
<image src="../../static/detection/teel.png" mode=""></image> <image src="../../static/detection/teel.png" mode=""></image>
</view> </view>
</view> </view>
<view class="" @click="godetails(item.id)"> <view class="">
<view class="on-input"> <view class="on-input">
<uni-icons type="person" color="#999999" size="16"></uni-icons> <uni-icons type="person" color="#999999" size="16"></uni-icons>
<text>客户</text> <text>客户</text>
<text>{{item.buyName?item.buyName:""}}</text> <text>{{ item.buyName ? item.buyName : "" }}</text>
</view> </view>
<view class="on-input"> <view class="on-input">
<uni-icons type="phone" color="#999999" size="16"></uni-icons> <uni-icons type="phone" color="#999999" size="16"></uni-icons>
<text>电话</text> <text>电话</text>
<text>{{item.buyPhone}}</text> <text>{{ item.buyPhone }}</text>
</view> </view>
<view class="on-input"> <view class="on-input">
<uni-icons type="map" color="#999999" size="16"></uni-icons> <uni-icons type="map" color="#999999" size="16"></uni-icons>
<text>订单号</text> <text>订单号</text>
<text>{{item.orderNo}}</text> <text>{{ item.orderNo }}</text>
</view> </view>
<view class="on-input"> <view class="on-input">
<uni-icons type="more" color="#999999" size="16"></uni-icons> <uni-icons type="more" color="#999999" size="16"></uni-icons>
<text>车牌号</text> <text>车牌号</text>
<text>{{item.carNum}}</text> <text>{{ item.carNum }}</text>
</view> </view>
<view class="bottom-di"> <view class="bottom-di">
<view class="button-container">
<text>实付金额</text> <u-button class="button" v-if="item.workNodeStatus === '0'" @click="orderTaking(item)">同意</u-button>
<text class="ju">{{item.realPayMoney/100}}</text> <u-button class="button" @click="godetails(item)">查看详情</u-button>
</view> </view>
</view> </view>
</view>
</view>
</view> </view>
</view> </view>
</view>
<view class="lanniu" @click="gogogo">
<text>+ 添加线下订单</text> <view class="lanniu" @click="gogogo">
</view> <text>+ 添加线下订单</text>
<view style="width: 100%; height: 50px;"></view> </view>
<tabBar :msg="msg"></tabBar> <view style="width: 100%; height: 50px;"></view>
<tabBar :msg="msg"></tabBar>
</view>
</view>
</template> </template>
<script> <script>
import config from '@/config' import config from '@/config'
import request from '../../utils/request'; import request from '../../utils/request';
import tabBar from'../../components/staffTabBer/tabBar.vue' import tabBar from '../../components/staffTabBer/tabBar.vue'
export default {
data() { export default {
return { data() {
imgurl:this.$imgeUrl, return {
baseUrl:this.$baseUrl, imgurl: this.$imgeUrl,
infoDatas:{}, baseUrl: this.$baseUrl,
partnerId:uni.getStorageSync("partnerId"), infoDatas: {},
goodsTitle:'', partnerId: uni.getStorageSync("partnerId"),
tapindex:0, goodsTitle: '',
msg:'1', tapindex: 0,
carNum:'', msg: '1',
pageNum: 1,// carNum: '',
pageSize: 20,// pageNum: 1,//
totalPages: 0,// pageSize: 20,//
tapList:[ totalPages: 0,//
{ tapList: [
text:"待接受", {
value:"1" text: "待接受",
}, value: "1"
{ },
text:"进行中", {
value:"2" text: "进行中",
}, value: "2"
},
{
text:"已完成", {
value:"3", text: "已完成",
} value: "3",
] }
} ]
}, }
onLoad(){ },
// this.getList() onLoad() {
}, // this.getList()
onShow() { },
this.getList() onShow() {
}, this.getList()
onReachBottom() { },
console.log(111) onReachBottom() {
if (this.pageNum >= this.totalPages) { console.log(111)
uni.showToast({ if (this.pageNum >= this.totalPages) {
title: '没有下一页数据', uni.showToast({
icon: 'none' title: '没有下一页数据',
}) icon: 'none'
})
} else {
this.pageNum++ } else {
console.log(222) this.pageNum++
this.getList() console.log(222)
} this.getList()
}, }
components:{ },
tabBar, components: {
}, tabBar,
methods:{ },
callUser(phone){ methods: {
console.log(phone) callUser(phone) {
uni.makePhoneCall({ console.log(phone)
phoneNumber: phone // uni.makePhoneCall({
}); phoneNumber: phone //
}, });
async getList(){ },
let res = await request({ async getList() {
url:'/system/info/geStelectInspection', let res = await request({
method: 'get', url: '/system/info/geStelectInspection',
params:{ method: 'get',
partnerId:this.partnerId, params: {
status:this.tapindex, partnerId: this.partnerId,
carNum:this.carNum, status: this.tapindex + 1,
pageSize:this.pageSize, carNum: this.carNum,
pageNum:this.pageNum, pageSize: this.pageSize,
} pageNum: this.pageNum,
}) }
if(res.code == 200 ){ })
if (res.code == 200) {
if (this.pageNum != 1) {
this.infoDatas = this.infoDatas.concat(res.rows) if (this.pageNum != 1) {
}else{ this.infoDatas = this.infoDatas.concat(res.rows)
this.infoDatas = res.rows } else {
} this.infoDatas = res.rows
let total = res.total }
this.totalPages = Math.ceil(total / this.pageSize); let total = res.total
} this.totalPages = Math.ceil(total / this.pageSize);
}, }
getfan(){ },
uni.navigateBack() getfan() {
}, uni.navigateBack()
godetails(inspectionInfoId){ },
console.log("111"); godetails(item) {
uni.navigateTo({ console.log("111");
url:"/pages/index/orderdetails?inspectionInfoId="+inspectionInfoId uni.navigateTo({
}) url: "/pages/index/orderdetails?inspectionInfoId=" + item.id +"&workNodeId=" + item.workNodeId
}, })
gogogo(){ },
uni.navigateTo({ orderTaking(data){
url:'/pages/index/Neworder' request({
}) url:'/system/info/orderTaking',
}, method:'post',
tapqh(index){ params:{
this.tapindex = index inspectionId:data.id,
this.infoDatas=[] workNodeId:data.workNodeId
this.getList() }
} }).then(res=>{
} if(res.code == 200){
} uni.showToast({
title:'接单成功',
icon:'none'
})
this.tapindex = 1
this.getList()
}
})
},
gogogo() {
uni.navigateTo({
url: '/pages/index/Neworder'
})
},
tapqh(index) {
this.tapindex = index
this.infoDatas = []
this.getList()
}
}
}
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.content { .content {
box-sizing: border-box; box-sizing: border-box;
width: 100%; width: 100%;
height: calc(100vh); height: calc(100vh);
background: white; background: white;
} }
.sshi{
position: absolute;
bottom: 20px;
right: 20px;
width: 115px;
height: 115px;
box-sizing: border-box;
padding: 10px;
image{
width: 100%;
height: 100%;
}
}
.top-heder{
width: 100%;
height: 46px;
background: white;
display: flex;
justify-content: space-between;
align-items: center;
box-sizing: border-box;
padding: 5px 15px;
}
.t-left{
width: 10%;
}
.t-input{
width: 75%;
height: 36px;
background: #F0F0F0;
border-radius: 50px;
box-sizing: border-box;
padding: 0 15px;
display: flex;
align-items: center;
}
.top-ail{
width: 100%;
box-sizing: border-box;
padding: 15px;
background-color: #F4F4F4;
}
.mub{ .sshi {
background-color: #F4F4F4; position: absolute;
height: calc(100vh); bottom: 20px;
} right: 20px;
.tap{ width: 115px;
width: 100%; height: 115px;
height: 44px; box-sizing: border-box;
background: #FFFFFF; padding: 10px;
display: flex;
align-items: center; image {
justify-content: space-between; width: 100%;
} height: 100%;
.tap-box{ }
width: 50%; }
} .top-heder {
.xhuihui{ width: 100%;
width: 100%; height: 46px;
text-align: center; background: white;
font-size: 16px; display: flex;
font-family: Source Han Sans CN-Regular, Source Han Sans CN; justify-content: space-between;
font-weight: 400; align-items: center;
color: #666666; box-sizing: border-box;
} padding: 5px 15px;
.gang{ }
width: 24px;
height: 4px; .t-left {
background: #0D2E8D; width: 10%;
border-radius: 4px ; }
margin: 2px auto;
} .t-input {
.xzhei{ width: 75%;
height: 36px;
font-weight: bold !important; background: #F0F0F0;
color: #333333 !important; border-radius: 50px;
} box-sizing: border-box;
.m-box{ padding: 0 15px;
position: relative; display: flex;
background: #FFFFFF; align-items: center;
border-radius: 8px ;
box-sizing: border-box; }
padding: 15px 10px;
margin: 10px auto; .top-ail {
width: 100%;
} box-sizing: border-box;
.m-top{ padding: 15px;
width: 100%; background-color: #F4F4F4;
box-sizing: border-box;
padding-bottom: 15px; }
border-bottom: 1px solid #EEEEEE;
display: flex; .mub {
align-items: center; background-color: #F4F4F4;
justify-content: space-between; height: calc(100vh);
} }
.top-left{
.tap {
} width: 100%;
.top-right{ height: 44px;
z-index: 9999; background: #FFFFFF;
width: 33px; display: flex;
height: 33px; align-items: center;
border-radius: 50%; justify-content: space-between;
overflow: hidden; }
image{
width: 100%; .tap-box {
height: 100%; width: 50%;
}
}
}
.dhei{ .xhuihui {
font-size: 16px; width: 100%;
font-weight: bold; text-align: center;
color: #333333; font-size: 16px;
margin-bottom: 5px; font-family: Source Han Sans CN-Regular, Source Han Sans CN;
} font-weight: 400;
.xhui{ color: #666666;
font-size: 15px; }
font-weight: 400;
color: #999999; .gang {
} width: 24px;
.on-input{ height: 4px;
width: 100%; background: #0D2E8D;
display: flex; border-radius: 4px;
align-items: center; margin: 2px auto;
font-size: 15px; }
font-family: Source Han Sans CN-Regular, Source Han Sans CN;
font-weight: 400; .xzhei {
color: #999999;
margin-bottom:10px; font-weight: bold !important;
margin-top: 10px; color: #333333 !important;
// justify-content: space-between; }
}
.bottom-di{ .m-box {
padding-top: 10px; position: relative;
box-sizing: border-box; background: #FFFFFF;
border-top:1px solid #EEEEEE; border-radius: 8px;
} box-sizing: border-box;
.ju{ padding: 15px 10px;
font-size: 24px; margin: 10px auto;
font-weight: 600; }
color: #FF571A;
} .m-top {
.lanniu{ width: 100%;
width: 90%; box-sizing: border-box;
position: fixed; padding-bottom: 15px;
bottom: 60px; border-bottom: 1px solid #EEEEEE;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: space-between;
background: #0D2E8D; }
color: white;
height: 44px; .top-left {
border-radius: 8px;
font-weight: bold; }
transform: translate(-50%);
left: 50%; .top-right {
z-index: 9999999999999999999999999999999999999999999999999999999; z-index: 9999;
} width: 33px;
.csz{ height: 33px;
font-size: 20px ; border-radius: 50%;
font-weight: bold; overflow: hidden;
color: #FF571A;
} image {
</style> width: 100%;
height: 100%;
}
}
.dhei {
font-size: 16px;
font-weight: bold;
color: #333333;
margin-bottom: 5px;
}
.xhui {
font-size: 15px;
font-weight: 400;
color: #999999;
}
.on-input {
width: 100%;
display: flex;
align-items: center;
font-size: 15px;
font-family: Source Han Sans CN-Regular, Source Han Sans CN;
font-weight: 400;
color: #999999;
margin-bottom: 10px;
margin-top: 10px;
// justify-content: space-between;
}
.bottom-di {
display: flex;
justify-content: center;
align-items: center;
padding: 20px;
}
.button-container {
display: flex;
justify-content: space-between;
width: 100%;
}
.button {
flex: 1;
margin: 0 10px;
}
.ju {
font-size: 24px;
font-weight: 600;
color: #FF571A;
}
.lanniu {
width: 90%;
position: fixed;
bottom: 60px;
display: flex;
align-items: center;
justify-content: center;
background: #0D2E8D;
color: white;
height: 44px;
border-radius: 8px;
font-weight: bold;
transform: translate(-50%);
left: 50%;
z-index: 9999999999999999999999999999999999999999999999999999999;
}
.csz {
font-size: 20px;
font-weight: bold;
color: #FF571A;
}
</style>