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

File diff suppressed because it is too large Load Diff

View File

@ -26,7 +26,7 @@
</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.status == 1" :src="imgurl + '/noPass.png'" mode=""></image>
<view v-else class="csz"> <view v-else class="csz">
<text>重审中</text> <text>重审中</text>
</view> </view>

View File

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

View File

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