This commit is contained in:
许允枞 2024-11-05 18:05:04 +08:00
parent a7e9e00e63
commit 1069972658
5 changed files with 1226 additions and 1116 deletions

View File

@ -11,7 +11,7 @@
</view>
<view class="t-you"></view>
</view>
<view class="mub">
<view class="top-ail">
<u-upload
@ -25,11 +25,11 @@
<uni-icons type="scan" size="20" color="#ffffff"></uni-icons>
<text style="margin-left: 10px;">行驶证扫描</text>
</view>
</u-upload>
<!-- 名称 -->
<view class="box-list">
<view class="list-box">
<view class="l-left">客户姓名</view>
@ -72,7 +72,7 @@
<view class="l-right">
<input type="text" v-model="customerSource" placeholder="请输入客户来源">
</view>
</view>
<view class="list-box" >
<view class="l-left" @click="showgoods = true"><text style="color: red;font-weight: bold;text-align: center;">* </text>商品选择<text class="xixi">点击选择</text></view>
@ -81,7 +81,7 @@
<!-- <input type="text" v-model="goodstext" placeholder="请选择商品"> -->
</view>
</view>
<view class="list-box" >
<view class="l-left" @click="showxin = true">新旧车 <text class="xixi">点击选择</text> </view>
<view class="l-right">
@ -100,34 +100,34 @@
<input type="text" v-model="unitName" placeholder="请输入单位">
</view>
</view>
<view class="list-box" @click="toSelectProject()" >
<view class="l-left">检测流程</view>
<view class="l-right">
<input type="textarea" v-model="inspectionWorkNodeStr" placeholder="点击选择检测流程">
</view>
</view>
</view>
<view class="dlanniu" @click="getgoodes()" >
<text>开始检测</text>
</view>
<u-picker :show="show" :columns="columns" @confirm="confirms" @cancel="cancels" keyName="label"></u-picker>
<u-picker :show="showgoods" ref="uPicker" :columns="goodsone" @confirm="confirmgoods" @cancel="cancelgoods" @change="changeHandler" keyName="label"></u-picker>
<u-picker :show="shownature" :columns="nature" @confirm="confirmsnature" @cancel="cancelsnature" keyName="label"></u-picker>
<u-picker :show="showxin" :columns="xinlist" @confirm="confirmxin" @cancel="cancelxin" keyName="label"></u-picker>
<u-picker :show="showzhi" :columns="zhilist" @confirm="confirmzhi" @cancel="cancelzhi" keyName="label"></u-picker>
</view>
</view>
<!-- 底部 -->
</view>
</template>
@ -144,7 +144,7 @@
customerSource:'',
buyName:'',
buyPhone:'',
userAddress:'',
userAddress:'',
carNum:'',
carStatus:'',
carIdNo:'',
@ -186,18 +186,18 @@
this.getinitialize()
uni.$on('selectProject', (data) => {
this.inspectionWorkNodes = data
for (var i = 0; i < this.inspectionWorkNodes.length; i++) {
for (var i = 0; i < this.inspectionWorkNodes.length; i++) {
this.inspectionWorkNodeStr = this.inspectionWorkNodeStr + this.inspectionWorkNodes[i].projectName +" "
this.inspectionWorkNodes[i].orderNum = i+1
}
});
},
onShow() {
},
methods: {
changeHandler(e) {
console.log(e)
@ -242,7 +242,7 @@
cancelzhi(){
this.showzhi= false
},
confirmsnature(e){
this.naturetext = e.value[0].label
this.shownature = false
@ -259,11 +259,11 @@
cancelgoods(){
this.showgoods= false
},
async getinitialize(){
async getinitialize(){
let res = await request({
url:'/partnerOwn/partner/getCustomerSource',
method: 'get',
})
this.columns.push(res.data)
let rescar = await request({
@ -289,7 +289,7 @@
method: 'get',
})
this.zhilist.push(reszhi.data)
},
toSelectProject(){
uni.navigateTo({
@ -311,7 +311,7 @@
})
return
}
let data = {
partnerId:uni.getStorageSync('partnerId'),
buyName:this.buyName,
@ -327,7 +327,7 @@
carNature:this.carNature,
inspectionWorkNodes:this.inspectionWorkNodes
}
let res = await request({
url:'/system/info/add',
method: 'post',
@ -342,14 +342,14 @@
setTimeout(() => {
uni.navigateBack()
}, 2000);
},
//
async getgoods(){
let res = await request({
url:'/partnerOwn/partner/editPartnerInfo',
method: 'post',
@ -367,7 +367,7 @@
},
getxz(e){
this.releasebox.goodsCategoryId = e.value[0].id
console.log( e.value[0].categoryName)
console.log( e.value[0].categoryName)
this.ftitle = e.value[0].categoryName
},
gettapindex(index){
@ -387,7 +387,7 @@
},
deletePic1(event) {
this[`fileList${event.name}`].splice(event.index, 1)
},
},
async afterRead1(event) {
console.log(event,this[`fileList${event.name}`]);
// multiple true , file
@ -396,7 +396,7 @@
lists.map((item) => {
this[`fileList${event.name}`].push({
...item,
})
})
for (let i = 0; i < lists.length; i++) {
@ -409,14 +409,14 @@
}))
fileListLen++
}
},
},
uploadFilePromise1(url) {
uni.showLoading({
title: '扫描中',
});
return new Promise((resolve, reject) => {
let a = uni.uploadFile({
url: this.$baseUrl+'/common/uploadImg', //
@ -433,11 +433,11 @@
try {
let img = JSON.parse(res.data);
this.imagePath = img.data.url
setTimeout(() => {
this.vehicleLicenseOCR()
this.vehicleLicenseOCR()
}, 1000)
} catch (e) {
//TODO handle the exception
}
@ -447,7 +447,7 @@
}
});
})
},
},
async vehicleLicenseOCR(){
let data = {
imagePath :this.baseUrl +'/'+ this.imagePath
@ -466,17 +466,17 @@
this.carIdNo=res.data.FrontInfo.Vin
this.carNature=res.data.FrontInfo.UseCharacter
uni.hideLoading();
uni.showToast({
uni.showToast({
title: '识别成功',
});
console.log(res);
}
console.log(res);
}
}
}
</script>
@ -488,7 +488,7 @@
height: calc(100vh);
background: white;
}
.top-heder{
width: 100%;
height: 46px;
@ -520,7 +520,7 @@
padding: 0 15px;
display: flex;
align-items: center;
}
.top-ail{
width: 100%;
@ -542,7 +542,7 @@
height: 126px;
border-radius: 8px;
box-sizing: border-box;
background-color: white;
image{
width: 100%;
@ -601,7 +601,7 @@
align-items: center;
justify-content: center;
margin: 10px ;
}
.hui-right{
border-left:1px solid #DDDDDD;
@ -658,7 +658,7 @@
display: flex;
align-items: center;
box-sizing: border-box;
}
.ipt-kuang{
width: 70%;
@ -693,7 +693,7 @@
.da{
font-size: 16px;
}
//
//
.top{
box-sizing: border-box;
padding: 0px 15px;
@ -751,7 +751,7 @@
margin-top: 5px;
font-size: 12px;
font-weight: 400;
}
.tinput{
width: 100%;

File diff suppressed because it is too large Load Diff

View File

@ -18,15 +18,15 @@
<view class="gang" v-if="tapindex == index"></view>
</view>
</view>
<view class="mub">
<view class="top-ail" >
<view class="jsy" v-if="infoDatas.length == 0">
<image src="http://www.nuoyunr.com/lananRsc/detection/qs.png" mode=""></image>
</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'">
<image v-if="!item.isRetrial||item.isRetrial == 0" :src="imgurl + '/noPass.png'" mode=""></image>
<image v-if="item.status == 1" :src="imgurl + '/noPass.png'" mode=""></image>
<view v-else class="csz">
<text>重审中</text>
</view>
@ -34,7 +34,7 @@
<view class="sshi" v-if="item.isPass == '1'">
<image :src="imgurl + '/pass.png'" mode=""></image>
</view>
<view class="m-top">
<view class="top-left">
<view class="dhei">{{item.goodsName}}</view>
@ -66,26 +66,26 @@
<text>{{item.carNum}}</text>
</view>
<view class="bottom-di">
<text>实付金额</text>
<text class="ju">{{item.realPayMoney/100}}</text>
</view>
</view>
</view>
</view>
</view>
<view class="lanniu" @click="gogogo">
<text>+ 添加线下订单</text>
</view>
</view>
</template>
<script>
import config from '@/config'
import request from '../../utils/request';
import request from '../../utils/request';
export default {
data() {
return {
@ -105,11 +105,11 @@
text:"进行中",
value:"0"
},
{
text:"已完成",
value:"1",
}
}
]
}
},
@ -127,7 +127,7 @@
title: '没有下一页数据',
icon: 'none'
})
} else {
this.pageNum++
console.log(222)
@ -146,7 +146,7 @@
});
},
async getList(){
let res = await request({
url:'/partnerOwn/partner/inspectionList',
method: 'get',
@ -157,10 +157,10 @@
pageSize:this.pageSize,
pageNum:this.pageNum,
}
})
})
console.log(res,161);
if(res.code == 200 ){
if (this.pageNum != 1) {
this.infoDatas = this.infoDatas.concat(res.rows)
}else{
@ -200,7 +200,7 @@
height: calc(100vh);
background: white;
}
.sshi{
position: absolute;
bottom: 20px;
@ -236,14 +236,14 @@
padding: 0 15px;
display: flex;
align-items: center;
}
.top-ail{
width: 100%;
box-sizing: border-box;
padding: 15px;
background-color: #F4F4F4;
}
.mub{
@ -260,7 +260,7 @@
}
.tap-box{
width: 50%;
}
.xhuihui{
width: 100%;
@ -278,7 +278,7 @@
margin: 2px auto;
}
.xzhei{
font-weight: bold !important;
color: #333333 !important;
}
@ -289,7 +289,7 @@
box-sizing: border-box;
padding: 15px 10px;
margin: 10px auto;
}
.m-top{
width: 100%;
@ -301,7 +301,7 @@
justify-content: space-between;
}
.top-left{
}
.top-right{
z-index: 9999;
@ -313,7 +313,7 @@
width: 100%;
height: 100%;
}
}
.dhei{
font-size: 16px;
@ -345,7 +345,7 @@
}
.ju{
font-size: 24px;
font-weight: 600;
color: #FF571A;
}
@ -370,4 +370,4 @@
font-weight: bold;
color: #FF571A;
}
</style>
</style>

View File

@ -1,178 +1,193 @@
<template>
<view class="content">
<view style="width: 100%; height: 44px;"></view>
<view class="top-heder">
<view class="t-left" @click="getback()">
<uni-icons type="left" size="18"></uni-icons>
</view>
<view class="t-title">
<text>选择检测项目</text>
</view>
<view class="t-you"></view>
</view>
<view class="cont_box">
<view class="title_">
可选检测项目
</view>
<view class="box_">
<view class="box_button " :class="{ 'box_button_x' :selectProject.indexOf(item)>-1 }" v-for="item in inpectionProjects" @click="clickProject(item)">{{item.projectName}}</view>
</view>
<view class="title_">
已选检测项目
</view>
<u-steps activeColor="#0D2E8D" direction="column">
<u-steps-item :iconSize="iconSize" v-for="item in selectProject" :title="item.projectName" >
</u-steps-item>
</u-steps>
</view>
<view class="dlanniu" @click="sureChoose()" >
<text>确定选择</text>
</view>
<view class="content">
<view style="width: 100%; height: 44px;"></view>
<view class="top-heder">
<view class="t-left" @click="getback()">
<uni-icons type="left" size="18"></uni-icons>
</view>
<view class="t-title">
<text>选择检测项目</text>
</view>
<view class="t-you"></view>
</view>
<view class="cont_box">
</view>
<view class="title_">
可选检测项目
</view>
<view class="box_">
<view class="box_button " :class="{ 'box_button_x' :selectProject.indexOf(item)>-1 }"
v-for="item in inpectionProjects" @click="clickProject(item)">{{ item.projectName }}
</view>
</view>
<view class="title_">
已选检测项目
</view>
<u-steps activeColor="#0D2E8D" direction="column">
<u-steps-item :iconSize="iconSize" v-for="item in selectProject" :title="item.projectName">
</u-steps-item>
</u-steps>
</view>
<view class="dlanniu" @click="sureChoose()">
<text>确定选择</text>
</view>
</view>
</template>
<script>
import request from '../../utils/request';
export default {
data() {
return {
iconSize:130,
inpectionProjects:[],
selectProject:[]
}
},
onShow() {
this.getProjects()
},
methods: {
sureChoose(){
if(this.selectProject.length == 0){
uni.showToast({
title:'请选择项目!',
icon:'none'
})
return
}
uni.$emit('selectProject', this.selectProject);
this.getback()
},
getback(){
uni.navigateBack()
},
async getProjects(){
let res = await request({
url:'/inspection/dl-inspection-project/page',
method: 'get',
params:{
pageNo:1,
pageSize:100
}
})
this.inpectionProjects = res.data.records
},
clickProject(data){
let idx = this.selectProject.indexOf(data)
if(idx>-1){
// 使splice
this.selectProject.splice(idx, 1);
}else{
this.selectProject.push(data)
}
}
}
}
import request from '../../utils/request';
export default {
data() {
return {
iconSize: 130,
inpectionProjects: [],
selectProject: []
}
},
onShow() {
this.getProjects()
},
methods: {
sureChoose() {
if (this.selectProject.length == 0) {
uni.showToast({
title: '请选择项目!',
icon: 'none'
})
return
}
this.selectProject.map(item => {
item.projectId = item.id
item.id = undefined
})
uni.$emit('selectProject', this.selectProject);
this.getback()
},
getback() {
uni.navigateBack()
},
async getProjects() {
let res = await request({
url: '/inspection/dl-inspection-project/page',
method: 'get',
params: {
pageNo: 1,
pageSize: 100
}
})
this.inpectionProjects = res.data.records
},
clickProject(data) {
let idx = this.selectProject.indexOf(data)
if (idx > -1) {
// 使splice
this.selectProject.splice(idx, 1);
} else {
this.selectProject.push(data)
}
}
}
}
</script>
<style scoped>
.cont_box{
box-sizing: border-box;
padding: 10px;
}
.title_{
font-weight: bold;
margin-bottom: 5px;
}
.box_{
width: 100%;
display: flex;
flex-wrap: wrap;
}
.box_button_x{
border-radius: 6px;
border: 1px solid #0D2E8D;
display: flex;
align-items: center;
justify-content: center;
font-size: 14px;
box-sizing: border-box;
padding: 5px 10px;
margin-right: 5px;
margin-bottom: 5px;
background: #0D2E8D;
color: #fff;
}
.box_button{
border-radius: 6px;
border: 1px solid #999;
display: flex;
align-items: center;
justify-content: center;
font-size: 14px;
box-sizing: border-box;
padding: 5px 10px;
margin-right: 5px;
margin-bottom: 5px;
}
.dlanniu{
width: 80%;
height: 45px;
background: linear-gradient(180deg, #3F61C0 0%, #0D2E8D 100%);
border-radius: 50px;
display: flex;
align-items: center;
justify-content: center;
margin: 20px auto;
color: white;
}
.t-you{
height: 100%;
width: 20%;
}
.content {
box-sizing: border-box;
width: 100%;
height: calc(100vh);
background: white;
}
.top-heder{
width: 100%;
height: 46px;
background: white;
display: flex;
align-items: center;
justify-content: space-between;
box-sizing: border-box;
padding: 5px 15px;
}
.t-title{
font-size: 17px;
font-weight: bold;
color: #333333;
}
.t-left{
width: 10%;
}
.cont_box {
box-sizing: border-box;
padding: 10px;
}
.title_ {
font-weight: bold;
margin-bottom: 5px;
}
.box_ {
width: 100%;
display: flex;
flex-wrap: wrap;
}
.box_button_x {
border-radius: 6px;
border: 1px solid #0D2E8D;
display: flex;
align-items: center;
justify-content: center;
font-size: 14px;
box-sizing: border-box;
padding: 5px 10px;
margin-right: 5px;
margin-bottom: 5px;
background: #0D2E8D;
color: #fff;
}
.box_button {
border-radius: 6px;
border: 1px solid #999;
display: flex;
align-items: center;
justify-content: center;
font-size: 14px;
box-sizing: border-box;
padding: 5px 10px;
margin-right: 5px;
margin-bottom: 5px;
}
.dlanniu {
width: 80%;
height: 45px;
background: linear-gradient(180deg, #3F61C0 0%, #0D2E8D 100%);
border-radius: 50px;
display: flex;
align-items: center;
justify-content: center;
margin: 20px auto;
color: white;
}
.t-you {
height: 100%;
width: 20%;
}
.content {
box-sizing: border-box;
width: 100%;
height: calc(100vh);
background: white;
}
.top-heder {
width: 100%;
height: 46px;
background: white;
display: flex;
align-items: center;
justify-content: space-between;
box-sizing: border-box;
padding: 5px 15px;
}
.t-title {
font-size: 17px;
font-weight: bold;
color: #333333;
}
.t-left {
width: 10%;
}
</style>

View File

@ -26,7 +26,7 @@
</view>
<view class="m-box" v-for="(item,index) in infoDatas" :key="index">
<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.status == 1" :src="imgurl + '/noPass.png'" mode=""></image>
<view v-else class="">
<text>重审中</text>
</view>
@ -67,8 +67,8 @@
</view>
<view class="bottom-di">
<view class="button-container">
<u-button class="button" v-if="item.workNodeStatus === '0'" @click="orderTaking(item)">同意</u-button>
<u-button class="button" @click="godetails(item)">查看详情</u-button>
<u-button class="button" v-if="item.workNodeStatus === '0'" @click="orderTaking(item)" size="10">同意</u-button>
<u-button class="button" @click="godetails(item)" size="10">查看详情</u-button>
</view>
</view>
</view>
@ -181,7 +181,7 @@ export default {
godetails(item) {
console.log("111");
uni.navigateTo({
url: "/pages/index/orderdetails?inspectionInfoId=" + item.id +"&workNodeId=" + item.workNodeId
url: "/pages/index/orderdetails?inspectionInfoId=" + item.id +"&workNodeId=" + item.workNodeId + "&workNodeStatus=" + item.workNodeStatus
})
},
orderTaking(data){
@ -395,10 +395,13 @@ export default {
}
.button {
flex: 1;
margin: 0 10px;
flex: 0.5; /* 减小按钮的占比 */
margin: 0 5px; /* 缩小两侧间距 */
padding: 5px 10px; /* 缩小按钮内边距 */
font-size: 0.9rem; /* 缩小字体 */
}
.ju {
font-size: 24px;