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

View File

@ -14,13 +14,13 @@
</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>
@ -37,38 +37,39 @@
<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>
@ -86,41 +87,42 @@
</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 {
export default {
data() { data() {
return { return {
imgurl:this.$imgeUrl, imgurl: this.$imgeUrl,
baseUrl:this.$baseUrl, baseUrl: this.$baseUrl,
infoDatas:{}, infoDatas: {},
partnerId:uni.getStorageSync("partnerId"), partnerId: uni.getStorageSync("partnerId"),
goodsTitle:'', goodsTitle: '',
tapindex:0, tapindex: 0,
msg:'1', msg: '1',
carNum:'', carNum: '',
pageNum: 1,// pageNum: 1,//
pageSize: 20,// pageSize: 20,//
totalPages: 0,// totalPages: 0,//
tapList:[ tapList: [
{ {
text:"待接受", text: "待接受",
value:"1" value: "1"
}, },
{ {
text:"进行中", text: "进行中",
value:"2" value: "2"
}, },
{ {
text:"已完成", text: "已完成",
value:"3", value: "3",
} }
] ]
} }
}, },
onLoad(){ onLoad() {
// this.getList() // this.getList()
}, },
onShow() { onShow() {
@ -140,60 +142,79 @@
this.getList() this.getList()
} }
}, },
components:{ components: {
tabBar, tabBar,
}, },
methods:{ methods: {
callUser(phone){ callUser(phone) {
console.log(phone) console.log(phone)
uni.makePhoneCall({ uni.makePhoneCall({
phoneNumber: phone // phoneNumber: phone //
}); });
}, },
async getList(){ async getList() {
let res = await request({ let res = await request({
url:'/system/info/geStelectInspection', url: '/system/info/geStelectInspection',
method: 'get', method: 'get',
params:{ params: {
partnerId:this.partnerId, partnerId: this.partnerId,
status:this.tapindex, status: this.tapindex + 1,
carNum:this.carNum, carNum: this.carNum,
pageSize:this.pageSize, pageSize: this.pageSize,
pageNum:this.pageNum, pageNum: this.pageNum,
} }
}) })
if(res.code == 200 ){ if (res.code == 200) {
if (this.pageNum != 1) { if (this.pageNum != 1) {
this.infoDatas = this.infoDatas.concat(res.rows) this.infoDatas = this.infoDatas.concat(res.rows)
}else{ } else {
this.infoDatas = res.rows this.infoDatas = res.rows
} }
let total = res.total let total = res.total
this.totalPages = Math.ceil(total / this.pageSize); this.totalPages = Math.ceil(total / this.pageSize);
} }
}, },
getfan(){ getfan() {
uni.navigateBack() uni.navigateBack()
}, },
godetails(inspectionInfoId){ godetails(item) {
console.log("111"); console.log("111");
uni.navigateTo({ uni.navigateTo({
url:"/pages/index/orderdetails?inspectionInfoId="+inspectionInfoId url: "/pages/index/orderdetails?inspectionInfoId=" + item.id +"&workNodeId=" + item.workNodeId
}) })
}, },
gogogo(){ orderTaking(data){
request({
url:'/system/info/orderTaking',
method:'post',
params:{
inspectionId:data.id,
workNodeId:data.workNodeId
}
}).then(res=>{
if(res.code == 200){
uni.showToast({
title:'接单成功',
icon:'none'
})
this.tapindex = 1
this.getList()
}
})
},
gogogo() {
uni.navigateTo({ uni.navigateTo({
url:'/pages/index/Neworder' url: '/pages/index/Neworder'
}) })
}, },
tapqh(index){ tapqh(index) {
this.tapindex = index this.tapindex = index
this.infoDatas=[] this.infoDatas = []
this.getList() this.getList()
} }
} }
} }
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@ -202,9 +223,9 @@
width: 100%; width: 100%;
height: calc(100vh); height: calc(100vh);
background: white; background: white;
} }
.sshi{ .sshi {
position: absolute; position: absolute;
bottom: 20px; bottom: 20px;
right: 20px; right: 20px;
@ -212,12 +233,14 @@
height: 115px; height: 115px;
box-sizing: border-box; box-sizing: border-box;
padding: 10px; padding: 10px;
image{
image {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
} }
.top-heder{
.top-heder {
width: 100%; width: 100%;
height: 46px; height: 46px;
background: white; background: white;
@ -226,11 +249,13 @@
align-items: center; align-items: center;
box-sizing: border-box; box-sizing: border-box;
padding: 5px 15px; padding: 5px 15px;
} }
.t-left{
.t-left {
width: 10%; width: 10%;
} }
.t-input{
.t-input {
width: 75%; width: 75%;
height: 36px; height: 36px;
background: #F0F0F0; background: #F0F0F0;
@ -240,61 +265,69 @@
display: flex; display: flex;
align-items: center; align-items: center;
} }
.top-ail{
.top-ail {
width: 100%; width: 100%;
box-sizing: border-box; box-sizing: border-box;
padding: 15px; padding: 15px;
background-color: #F4F4F4; background-color: #F4F4F4;
} }
.mub{ .mub {
background-color: #F4F4F4; background-color: #F4F4F4;
height: calc(100vh); height: calc(100vh);
} }
.tap{
.tap {
width: 100%; width: 100%;
height: 44px; height: 44px;
background: #FFFFFF; background: #FFFFFF;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
} }
.tap-box{
.tap-box {
width: 50%; width: 50%;
} }
.xhuihui{
.xhuihui {
width: 100%; width: 100%;
text-align: center; text-align: center;
font-size: 16px; font-size: 16px;
font-family: Source Han Sans CN-Regular, Source Han Sans CN; font-family: Source Han Sans CN-Regular, Source Han Sans CN;
font-weight: 400; font-weight: 400;
color: #666666; color: #666666;
} }
.gang{
.gang {
width: 24px; width: 24px;
height: 4px; height: 4px;
background: #0D2E8D; background: #0D2E8D;
border-radius: 4px ; border-radius: 4px;
margin: 2px auto; margin: 2px auto;
} }
.xzhei{
.xzhei {
font-weight: bold !important; font-weight: bold !important;
color: #333333 !important; color: #333333 !important;
} }
.m-box{
.m-box {
position: relative; position: relative;
background: #FFFFFF; background: #FFFFFF;
border-radius: 8px ; border-radius: 8px;
box-sizing: border-box; box-sizing: border-box;
padding: 15px 10px; padding: 15px 10px;
margin: 10px auto; margin: 10px auto;
} }
.m-top{
.m-top {
width: 100%; width: 100%;
box-sizing: border-box; box-sizing: border-box;
padding-bottom: 15px; padding-bottom: 15px;
@ -302,34 +335,40 @@
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
} }
.top-left{
} .top-left {
.top-right{
}
.top-right {
z-index: 9999; z-index: 9999;
width: 33px; width: 33px;
height: 33px; height: 33px;
border-radius: 50%; border-radius: 50%;
overflow: hidden; overflow: hidden;
image{
image {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
} }
.dhei{
.dhei {
font-size: 16px; font-size: 16px;
font-weight: bold; font-weight: bold;
color: #333333; color: #333333;
margin-bottom: 5px; margin-bottom: 5px;
} }
.xhui{
.xhui {
font-size: 15px; font-size: 15px;
font-weight: 400; font-weight: 400;
color: #999999; color: #999999;
} }
.on-input{
.on-input {
width: 100%; width: 100%;
display: flex; display: flex;
align-items: center; align-items: center;
@ -337,22 +376,37 @@
font-family: Source Han Sans CN-Regular, Source Han Sans CN; font-family: Source Han Sans CN-Regular, Source Han Sans CN;
font-weight: 400; font-weight: 400;
color: #999999; color: #999999;
margin-bottom:10px; margin-bottom: 10px;
margin-top: 10px; margin-top: 10px;
// justify-content: space-between; // justify-content: space-between;
} }
.bottom-di{
padding-top: 10px; .bottom-di {
box-sizing: border-box; display: flex;
border-top:1px solid #EEEEEE; justify-content: center;
} align-items: center;
.ju{ padding: 20px;
}
.button-container {
display: flex;
justify-content: space-between;
width: 100%;
}
.button {
flex: 1;
margin: 0 10px;
}
.ju {
font-size: 24px; font-size: 24px;
font-weight: 600; font-weight: 600;
color: #FF571A; color: #FF571A;
} }
.lanniu{
.lanniu {
width: 90%; width: 90%;
position: fixed; position: fixed;
bottom: 60px; bottom: 60px;
@ -367,10 +421,11 @@
transform: translate(-50%); transform: translate(-50%);
left: 50%; left: 50%;
z-index: 9999999999999999999999999999999999999999999999999999999; z-index: 9999999999999999999999999999999999999999999999999999999;
} }
.csz{
font-size: 20px ; .csz {
font-size: 20px;
font-weight: bold; font-weight: bold;
color: #FF571A; color: #FF571A;
} }
</style> </style>