From 77a11754e267900101af8b4d123382ffa6e36cdb Mon Sep 17 00:00:00 2001
From: xyc <3422692813@qq.com>
Date: Fri, 30 May 2025 16:54:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/index/countEmployees.vue | 8 ++++
pages/index/newindex.vue | 3 +-
pages/index/neworderStatistic.vue | 16 +++++++
pages/index/orderdetails.vue | 4 ++
pages/manage/deviceManage.vue | 15 ++++--
pages/staff/staff.vue | 80 ++++++++++++++++++++++---------
6 files changed, 98 insertions(+), 28 deletions(-)
diff --git a/pages/index/countEmployees.vue b/pages/index/countEmployees.vue
index c1e95dc..46f7f63 100644
--- a/pages/index/countEmployees.vue
+++ b/pages/index/countEmployees.vue
@@ -4,6 +4,14 @@
+
+
+
+
订单统计
diff --git a/pages/index/neworderStatistic.vue b/pages/index/neworderStatistic.vue
index 7b828b6..ba7b8c8 100644
--- a/pages/index/neworderStatistic.vue
+++ b/pages/index/neworderStatistic.vue
@@ -75,6 +75,13 @@
+
+
+
@@ -217,6 +224,7 @@
chooseStatus: "1",
skuName: "",
payType: "",
+ datetimeRange: null,
startTime: null,
endTime: null,
carModelOrCarYear: null,
@@ -248,6 +256,14 @@
label: "退办理",
value: "4",
},
+ {
+ label: "重检",
+ value: "5",
+ },
+ {
+ label: "复检",
+ value: "6",
+ },
],
appTypes: [{
label: "全部",
diff --git a/pages/index/orderdetails.vue b/pages/index/orderdetails.vue
index 17b765a..32edc4d 100644
--- a/pages/index/orderdetails.vue
+++ b/pages/index/orderdetails.vue
@@ -97,6 +97,10 @@
接车员
{{ detailData.meetManName }}
+
+ 交还车
+ {{ detailData.returnCarUserName }}
+
更换接车员
diff --git a/pages/manage/deviceManage.vue b/pages/manage/deviceManage.vue
index 1b3fa75..38a8841 100644
--- a/pages/manage/deviceManage.vue
+++ b/pages/manage/deviceManage.vue
@@ -134,10 +134,11 @@
this.fileId = data.folderId
}
this.getlist()
+ // this.getlist()
+ this.ifHasRole()
},
onShow() {
- this.getlist()
- this.ifHasRole()
+
},
onBackPress(options) {
// 点击虚拟键或者侧滑的时候触发（不允许返回）
@@ -164,7 +165,12 @@
methods: {
formatDate,
async getlist(flag) {
- this.isLoading = true
+ // this.isLoading = true
+ // uniapp自带加在动画
+ //显示加载框
+ uni.showLoading({
+ title: '加载中'
+ });
let data = {
pageSize: this.pageSize,
pageNum: this.pageNum,
@@ -188,7 +194,8 @@
}
let total = res.total
this.totalPages = Math.ceil(total / this.pageSize);
- this.isLoading = false
+ //隐藏加载框
+ uni.hideLoading();
// this.getCountByDirectory()
},
ifHasRole() {
diff --git a/pages/staff/staff.vue b/pages/staff/staff.vue
index e7f7d89..b24ea7a 100644
--- a/pages/staff/staff.vue
+++ b/pages/staff/staff.vue
@@ -131,6 +131,10 @@
@click="meetCarPhoto(item);openMeetCar = true" size="10">
接车拍照
+
+ 还车拍照
+
更换人员
@@ -239,6 +243,7 @@
openMeetCar: false,
isTriggered: false,
selectedInfo: undefined,
+ selectType: undefined,
partnerId: uni.getStorageSync("partnerId"),
goodsTitle: '',
tapindex: 0,
@@ -370,6 +375,10 @@
text: "检测中",
value: "2",
},
+ {
+ text: "还车",
+ value: "10",
+ },
{
text: "待重检",
value: "3",
@@ -657,28 +666,48 @@
})
return
}
- request({
- url: '/system/info/meetCarPhoto',
- data: {
- meetCarId: this.selectedInfo.id,
- remark: this.remark,
- sourceType: this.selectedInfo.sourceType,
- dealImages: this.fileList1.map(item => item.url).join(',')
- },
- method: 'post'
- }).then(res => {
- if (res.code === 200) {
- uni.showToast({
- title: '提交成功',
- icon: 'none',
- duration: 2000
- });
- this.openMeetCar = false
- this.remark = ''
- this.fileList1 = []
- this.onRefresherrefresh()
- }
- })
+ if (this.selectType) {
+ request({
+ url: '/system/info/returnCarPhoto',
+ data: {
+ inspectionInfoId: this.selectedInfo.id,
+ remark: this.remark,
+ dealImages: this.fileList1.map(item => item.url).join(',')
+ },
+ method: 'post'
+ }).then(res => {
+ if (res.code === 200) {
+ uni.showToast({
+ title: '提交成功',
+ icon: 'none',
+ duration: 2000
+ });
+ }
+ })
+ }else {
+ request({
+ url: '/system/info/meetCarPhoto',
+ data: {
+ meetCarId: this.selectedInfo.id,
+ remark: this.remark,
+ sourceType: this.selectedInfo.sourceType,
+ dealImages: this.fileList1.map(item => item.url).join(',')
+ },
+ method: 'post'
+ }).then(res => {
+ if (res.code === 200) {
+ uni.showToast({
+ title: '提交成功',
+ icon: 'none',
+ duration: 2000
+ });
+ }
+ })
+ }
+ this.openMeetCar = false
+ this.remark = ''
+ this.fileList1 = []
+ this.onRefresherrefresh()
},
async afterRead(event) {
// 当设置 multiple 为 true 时, file 为数组格式，否则为对象格式
@@ -835,7 +864,7 @@
* @param {Array} list - 数据列表（默认使用 tapList）
* @returns {string|null} 返回对应的 value，找不到则返回 null
*/
- getValueByText(text, list = this.tapList) {
+ getValueByText(text, list = this.newTapList) {
const item = list.find(item => item.text === text);
return item ? item.value : null;
},
@@ -1002,6 +1031,11 @@
meetCarPhoto(data) {
this.selectedInfo = data
},
+ /**接车拍照 */
+ returnCarPhoto(data) {
+ this.selectedInfo = data
+ this.selectType = 1
+ },
gogogo() {
uni.navigateTo({
url: '/pages/index/Neworder'