sunliwei/detection-business
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: sunliwei:9ed929cf3f64e6ac55b3ac4366dd250401223661
Branches Tags
sunliwei:master
...
compare: sunliwei:d700f72a8ca6cb2ff1c2139540897c4ea0690f9a
Branches Tags
sunliwei:master

6 Commits
9ed929cf3f ... d700f72a8c

Author SHA1 Message Date
xiaofajia
d700f72a8c 9 1% 2024-12-09 16:30:19 +08:00
xiaofajia
6b446f0fd6 员工同意操作订单即认定为开始检测，结束检测时应显示的是开始-结束订单的操作时间 每一步操作都需要显示 开始和结束时间 2024-12-09 16:14:51 +08:00
xiaofajia
924df8f602 多个可操作内容时只显示一个订单 2024-12-09 15:23:47 +08:00
xiaofajia
061e9dd9ba 每一步操作都需要显示 开始和结束时间 2024-12-09 13:35:17 +08:00
xiaofajia
37ba57178b 商品价格 - > ￥ 2024-12-09 11:04:54 +08:00
xiaofajia
75bbe0eac7 提交不合格备注原因时，显示内容时同时显示“备注”两个字 2024-12-09 10:40:21 +08:00
4 changed files with 105 additions and 25 deletions
Show Stats Expand all files Collapse all files

6
pages/index/oldOrderProject.vue.vue
View File

@ -6,14 +6,14 @@
<uni-icons type="left" size="18"></uni-icons>
</view>
<view class="t-title">
<text>选择检测项目</text>
<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' :isItemSelected(item) }"
@ -22,7 +22,7 @@
</view>
<view class="title_">
已选检测项目：
已选检测内容：
</view>
<view style="margin-bottom: 15px;" v-for="(item,index) in selectProject" :key="index">
<view class="steps_">

10
pages/index/orderdetails.vue
View File

@ -36,11 +36,11 @@
<view class="dis-hui">
<text>商品：</text>
<text>检测类型：</text>
<text>{{ detailData.goodsName }}</text>
</view>
<view class="dis-hui">
<text>商品价格：</text>
<text>￥：</text>
<text>{{ detailData.goodsPrice / 100 }}元</text>
</view>
</view>
@ -150,7 +150,8 @@
</view>
</view>
</view>
<text class="times">{{ item.createTime }}</text>
<text class="times" v-if="!item.updateTime">{{ item.createTime }}</text>
<text class="times" v-else style="text-align: center">{{ item.createTime }}<br/><text>至</text><br/>{{item.updateTime}}</text>
</view>
<view class="p_box" v-if="index+1 <detailData.stepInfos.length || (item.images.length > 0 || item.content)">
@ -180,7 +181,7 @@
<u-popup :show="hge" @close="closehge" :round="10" @open="openxl">
<view class="popup-box">
<view class="on-inputx">
<text>说明：</text>
<text>备注：</text>
<!-- <input type="text" placeholder="请输入内容"> -->
</view>
<u--textarea v-model="remark" placeholder="请输入内容" border="bottom"></u--textarea>
@ -655,6 +656,7 @@ export default {
}
})
this.detailData = res.data
this.detailData.stepInfos.forEach(item => {
// 检查 item.images 是否为有效的字符串
if (typeof item.images === 'string' && item.images.trim() !== '') {

6
pages/index/selectProject.vue
View File

@ -6,14 +6,14 @@
<uni-icons type="left" size="18"></uni-icons>
</view>
<view class="t-title">
<text>选择检测项目</text>
<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' :isItemSelected(item) }"
@ -22,7 +22,7 @@
</view>
<view class="title_">
已选检测项目：
已选检测内容：
</view>
<view style="margin-bottom: 15px;" v-for="(item,index) in selectProject" :key="index">
<view class="steps_">

108
pages/staff/staff.vue
View File

@ -39,7 +39,9 @@
<view class="top-left">
<view class="dhei">{{ item.goodsName }}</view>
<text class="xhui">接待人：{{ item.workerName }}</text>
<text class="xhui" style="margin-left: 50rpx;">检测项目：{{ item.projectName }}</text>
<text class="xhui" style="margin-left: 50rpx;">
检测类型：{{ item.projectName }}
</text>
</view>
<view @click="callUser(item.buyPhone)" class="top-right">
<image src="../../static/detection/teel.png" mode=""></image>
@ -58,22 +60,23 @@
</view>
<view class="on-input">
<uni-icons type="map" color="#999999" size="16"></uni-icons>
<text>订单号：</text>
<text>{{ item.orderNo }}</text>
<text>车牌号：</text>
<text>{{ item.carNum }}</text>
</view>
<view class="on-input">
<uni-icons type="map" color="#999999" size="16"></uni-icons>
<text>引车员：</text>
<text>{{ item.leadManName }}</text>
<text>客户来源：</text>
<text>{{ item.customerSource }}</text>
</view>
<view class="on-input">
<uni-icons type="more" color="#999999" size="16"></uni-icons>
<text>车牌号：</text>
<text>检测内容：</text>
<text>{{ item.carNum }}</text>
</view>
<view class="bottom-di">
<view class="button-container">
<u-button class="button" v-if="item.workNodeStatus === '0'" @click="orderTaking(item)" size="10">同意
<u-button class="button" v-if="item.workNodeStatus === '0'" @click="orderTakingBefore(item)" size="10">
开始检测
</u-button>
<u-button class="button" v-if="item.workNodeStatus === '1'" @click="cancelAnOrder(item)" size="10">
取消接单
@ -87,6 +90,11 @@
</view>
</view>
<view class="lanniu-container2">
<u-picker :show="show" :columns="chooseWorkNodes" @confirm="confirms" @cancel="cancels"
keyName="label"></u-picker>
</view>
<view class="lanniu-container" v-if="isExamine">
<view class="lanniu" @click="gogogo">
<text>+ 添加线下订单</text>
@ -98,7 +106,6 @@
<view style="width: 100%; height: 50px;"></view>
<tabBar :msg="msg"></tabBar>
</view>
</template>
@ -117,27 +124,60 @@ export default {
partnerId: uni.getStorageSync("partnerId"),
goodsTitle: '',
tapindex: 0,
isExamine:false,
isExamine: false,
msg: '1',
carNum: '',
pageNum: 1,//第几页
pageSize: 20,//一页多少张
totalPages: 0,//总数
// tapList: [
// {
// text: "待接受",
// value: "1"
// },
// {
// text: "进行中",
// value: "2"
// },
//
// {
// text: "已完成",
// value: "3",
// }
// ],
tapList: [
{
text: "待接受",
text: "待支付",
value: "1"
},
{
text: "进行中",
text: "待检测",
value: "2"
},
{
text: "已完成",
text: "检测中",
value: "3",
}
]
},
{
text: "待重检",
value: "4",
},
{
text: "待复检",
value: "5",
},
{
text: "已完成",
value: "6",
},
],
chooseWorkNodes: [],
show: false,
takingData: {
workNodeId: null,
id: null
},
}
},
onLoad() {
@ -171,6 +211,35 @@ export default {
tabBar,
},
methods: {
confirms(e) {
this.takingData.workNodeId = e.value[0].value
this.show = false
this.orderTaking(this.takingData)
},
cancels() {
this.show = false
},
// 让操作人选择要开始的项目
async orderTakingBefore(item) {
this.takingData = {
workNodeId: null,
id: item.id
}
let res = await request({
url: '/partnerOwn/partner/inspectionDetail',
method: 'get',
params: {
inspectionInfoId: item.id
}
})
this.chooseWorkNodes = [res.data.workNodes.map(i => {
return {
label: i.projectName,
value: i.id
}
})]
this.show = true
},
msgInfo() {
console.log(this.msgSocket, 'msgSocket')
if (this.msgSocket) {
@ -481,6 +550,7 @@ export default {
font-weight: 600;
color: #FF571A;
}
.lanniu-container {
width: 90%;
position: fixed;
@ -490,7 +560,15 @@ export default {
justify-content: space-between; /* 控制子元素之间的间距，可以改为 center/space-around */
transform: translate(-50%);
left: 50%;
z-index: 9999999999999999999999999999999999999999999999999999999;
z-index: 999998;
}
.lanniu-container2 {
position: fixed;
display: flex;
align-items: center;
justify-content: space-between; /* 控制子元素之间的间距，可以改为 center/space-around */
z-index: 999999;
}
.lanniu {