检测
This commit is contained in:
许允枞
parent
a7e9e00e63
commit
1069972658
@ -105,7 +105,7 @@
|
||||
|
||||
</view>
|
||||
|
||||
<view class="annniu" v-if="detailData.status&&detailData.status == 0" @click="hge = true">
|
||||
<view class="annniu" v-if="detailData.status&&detailData.status == 0&&workNodeStatus == 1" @click="hge = true;getProject()">
|
||||
<view class="">结束检测</view>
|
||||
</view>
|
||||
<view class="annniu"
|
||||
@ -117,6 +117,24 @@
|
||||
@cancel="cancel"></u-picker>
|
||||
<u-popup :show="hge" @close="closehge" :round="10" @open="openxl">
|
||||
<view class="popup-box">
|
||||
<view class="on-inputx">
|
||||
<text>说明：</text>
|
||||
<!-- <input type="text" placeholder="请输入内容"> -->
|
||||
</view>
|
||||
<u--textarea v-model="remark" placeholder="请输入内容" border="bottom"></u--textarea>
|
||||
<view class="on-inputx">
|
||||
<text>施工图片：</text>
|
||||
<!-- <input type="text" placeholder="请输入内容"> -->
|
||||
</view>
|
||||
<u-upload
|
||||
:fileList="fileList1"
|
||||
@afterRead="afterRead"
|
||||
@delete="deletePic"
|
||||
name="1"
|
||||
multiple
|
||||
:maxCount="10"
|
||||
></u-upload>
|
||||
|
||||
<view class="t-title">是否合格</view>
|
||||
<view class="on-inputx">
|
||||
<view class="anniu" :class="{'an':geindex == index}" v-for="(item,index) in sfou" :key="index"
|
||||
@ -131,19 +149,17 @@
|
||||
:key="index" @click="shenmowanyi(item.value,index)">
|
||||
<text>{{ item.text }}</text>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
<view class="on-inputx">
|
||||
<text>说明：</text>
|
||||
<!-- <input type="text" placeholder="请输入内容"> -->
|
||||
<view class="t-title" v-if="tbindex == 1 && isRetrial == 1 && isPass != '1'">选择重审后回到的节点</view>
|
||||
<view class="box_ on-inputx" v-if="tbindex == 1 && isRetrial == 1 && isPass != '1'">
|
||||
<view class="box_button " :class="{ 'box_button_x' :csId == item.id }"
|
||||
v-for="item in selectProject" @click="clickProject(item)">{{ item.projectName }}
|
||||
</view>
|
||||
</view>
|
||||
<u--textarea v-model="remark" placeholder="请输入内容" border="bottom"></u--textarea>
|
||||
<view class="bottomx" @click="submit()">
|
||||
<uni-icons type="compose" color="#0D2E8D" size="20"></uni-icons>
|
||||
<text>提交</text>
|
||||
</view>
|
||||
|
||||
|
||||
</view>
|
||||
</u-popup>
|
||||
<u-popup :show="xling" @close="closexl" :round="10" @open="openxl">
|
||||
@ -161,11 +177,17 @@
|
||||
</view>
|
||||
<view class="on-inputx">
|
||||
|
||||
<text><text style="color: red;font-weight: bold;text-align: center;">* </text>实付金额：</text>
|
||||
<text>
|
||||
<text style="color: red;font-weight: bold;text-align: center;">*</text>
|
||||
实付金额：
|
||||
</text>
|
||||
<input type="number" v-model="payMoney" placeholder="请输入实付金额">
|
||||
</view>
|
||||
<view class="on-inputx">
|
||||
<text><text style="color: red;font-weight: bold;text-align: center;">* </text>付款方式：</text>
|
||||
<text>
|
||||
<text style="color: red;font-weight: bold;text-align: center;">*</text>
|
||||
付款方式：
|
||||
</text>
|
||||
|
||||
</view>
|
||||
<view class="warp-box">
|
||||
@ -183,7 +205,8 @@
|
||||
<text>备注：</text>
|
||||
|
||||
</view>
|
||||
<u--textarea v-model="payRemark" placeholder="如果存在组合付款方式,请在备注中描述清楚" border="bottom"></u--textarea>
|
||||
<u--textarea v-model="payRemark" placeholder="如果存在组合付款方式,请在备注中描述清楚"
|
||||
border="bottom"></u--textarea>
|
||||
|
||||
|
||||
<view class="bottomx" @click="tiijiao()" style="margin-top: 10px;">
|
||||
@ -196,7 +219,8 @@
|
||||
keyName="label"></u-picker>
|
||||
|
||||
<uni-popup ref="alertDialog" type="dialog">
|
||||
<uni-popup-dialog cancelText="关闭" confirmText="确定" title="通知" content="您确定制证完成吗" @confirm="dialogConfirm"
|
||||
<uni-popup-dialog cancelText="关闭" confirmText="确定" title="通知" content="您确定制证完成吗"
|
||||
@confirm="dialogConfirm"
|
||||
@close="dialogClose"></uni-popup-dialog>
|
||||
</uni-popup>
|
||||
</view>
|
||||
@ -206,6 +230,7 @@
|
||||
import config from '@/config'
|
||||
import request from '../../utils/request';
|
||||
import upload from '@/utils/upload.js'
|
||||
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
@ -219,6 +244,7 @@
|
||||
bankList: [],
|
||||
bankShow: false,
|
||||
isRetrial: 1,
|
||||
tbindex: 1,
|
||||
isOnline: 1,
|
||||
hge: false,
|
||||
show: false,
|
||||
@ -228,9 +254,11 @@
|
||||
detailData: {},
|
||||
inspectionInfoId: '',
|
||||
workNodeId: '',
|
||||
workNodeStatus: '',
|
||||
stepInfo: {
|
||||
isPass: "0"
|
||||
},
|
||||
selectProject: [],
|
||||
lei: '请选择车辆类型',
|
||||
columns: [],
|
||||
cph: '',
|
||||
@ -239,6 +267,7 @@
|
||||
shelist: [],
|
||||
isPass: "1",
|
||||
remark: '',
|
||||
csId:'',
|
||||
sfou: [{
|
||||
text: '合格',
|
||||
value: "1"
|
||||
@ -262,6 +291,7 @@
|
||||
onLoad(option) {
|
||||
this.inspectionInfoId = option.inspectionInfoId
|
||||
this.workNodeId = option.workNodeId
|
||||
this.workNodeStatus = option.workNodeStatus
|
||||
|
||||
},
|
||||
onShow() {
|
||||
@ -298,6 +328,20 @@
|
||||
this.$refs.alertDialog.close()
|
||||
console.log('点击关闭')
|
||||
},
|
||||
//查询重审可以选择的项目
|
||||
getProject() {
|
||||
request({
|
||||
url: '/system/info/getWeorkNodesById',
|
||||
method: 'get',
|
||||
params: {
|
||||
inspectionId: this.inspectionId
|
||||
}
|
||||
}).then(res=>{
|
||||
console.log('获取项目',res.data)
|
||||
this.selectProject = res.data
|
||||
console.log('项目', this.selectProject)
|
||||
})
|
||||
},
|
||||
jisuan() {
|
||||
if (this.reduceMoney > (this.detailData.goodsPrice / 100)) {
|
||||
this.reduceMoney = this.detailData.goodsPrice / 100
|
||||
@ -341,24 +385,35 @@
|
||||
});
|
||||
},
|
||||
async submit() {
|
||||
console.log('isPass',this.isPass);
|
||||
console.log('geindex',this.geindex)
|
||||
let status = 0
|
||||
if (this.isPass == '1') {
|
||||
console.log('这是提交')
|
||||
status = 3
|
||||
}else{
|
||||
if (this.geindex == 1) {
|
||||
} else if (this.tbindex == 1 && this.isRetrial == 1) {
|
||||
console.log('这是重审')
|
||||
if (this.csId == '' || this.csId == undefined){
|
||||
uni.showToast({
|
||||
title:'请选择要返回的节点',
|
||||
icon:'none'
|
||||
})
|
||||
return
|
||||
}
|
||||
console.log('id', this.workNodeId)
|
||||
this.workNodeId = this.csId
|
||||
console.log('csId', this.csId)
|
||||
status = 2
|
||||
}else{
|
||||
} else if (this.tbindex == 0 && this.isRetrial == 0) {
|
||||
console.log('这是退办理')
|
||||
status = 1
|
||||
}
|
||||
}
|
||||
console.log('图片2', this.fileList2)
|
||||
let inspectionInfo = {
|
||||
inspectionInfoId: this.inspectionInfoId,
|
||||
isPass: this.isPass,
|
||||
id: this.workNodeId,
|
||||
selectType: status,
|
||||
remark: this.remark
|
||||
remark: this.remark,
|
||||
dealImages: this.fileList2.join(","),
|
||||
}
|
||||
let res = await request({
|
||||
// url: '/partnerOwn/partner/stopInspection',
|
||||
@ -370,7 +425,6 @@
|
||||
this.getindex()
|
||||
uni.showToast({
|
||||
title: "成功",
|
||||
|
||||
})
|
||||
uni.navigateBack();
|
||||
}
|
||||
@ -416,6 +470,10 @@
|
||||
})
|
||||
}
|
||||
},
|
||||
clickProject(data) {
|
||||
this.csId = data.id
|
||||
console.log('返回的节点id', data)
|
||||
},
|
||||
async getindex() {
|
||||
|
||||
let res = await request({
|
||||
@ -525,6 +583,7 @@
|
||||
}))
|
||||
fileListLen++
|
||||
}
|
||||
console.log('fileList', this[`fileList${event.name}`])
|
||||
},
|
||||
uploadFilePromise(url) {
|
||||
console.log(url);
|
||||
@ -533,8 +592,9 @@
|
||||
filePath: url,
|
||||
}).then((res) => {
|
||||
// this.newsCover = res.fileName
|
||||
this.fileList2.push(res.fileName)
|
||||
this.fileList2.push(res.data.url)
|
||||
console.log(res);
|
||||
return res.data.url
|
||||
})
|
||||
|
||||
},
|
||||
@ -720,7 +780,8 @@
|
||||
color: #FFFFFF;
|
||||
}
|
||||
|
||||
.box {}
|
||||
.box {
|
||||
}
|
||||
|
||||
.box-dis {
|
||||
box-sizing: border-box;
|
||||
@ -944,4 +1005,35 @@
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
.box_ {
|
||||
width: 100%;
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
.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;
|
||||
}
|
||||
.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;
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -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="csz">
|
||||
<text>重审中</text>
|
||||
</view>
|
||||
|
||||
@ -16,7 +16,9 @@
|
||||
可选检测项目：
|
||||
</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 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_">
|
||||
@ -29,11 +31,9 @@
|
||||
</u-steps>
|
||||
|
||||
|
||||
|
||||
</view>
|
||||
|
||||
|
||||
|
||||
<view class="dlanniu" @click="sureChoose()">
|
||||
<text>确定选择</text>
|
||||
</view>
|
||||
@ -43,6 +43,7 @@
|
||||
|
||||
<script>
|
||||
import request from '../../utils/request';
|
||||
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
@ -64,6 +65,10 @@
|
||||
})
|
||||
return
|
||||
}
|
||||
this.selectProject.map(item => {
|
||||
item.projectId = item.id
|
||||
item.id = undefined
|
||||
})
|
||||
uni.$emit('selectProject', this.selectProject);
|
||||
this.getback()
|
||||
},
|
||||
@ -101,15 +106,18 @@
|
||||
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;
|
||||
@ -124,6 +132,7 @@
|
||||
background: #0D2E8D;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
.box_button {
|
||||
border-radius: 6px;
|
||||
border: 1px solid #999;
|
||||
@ -136,6 +145,7 @@
|
||||
margin-right: 5px;
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
|
||||
.dlanniu {
|
||||
width: 80%;
|
||||
height: 45px;
|
||||
@ -147,16 +157,19 @@
|
||||
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;
|
||||
@ -167,11 +180,13 @@
|
||||
box-sizing: border-box;
|
||||
padding: 5px 15px;
|
||||
}
|
||||
|
||||
.t-title {
|
||||
font-size: 17px;
|
||||
font-weight: bold;
|
||||
color: #333333;
|
||||
}
|
||||
|
||||
.t-left {
|
||||
width: 10%;
|
||||
}
|
||||
|
||||
@ -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;
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user