diff --git a/config.js b/config.js
index f09c3b1..42ad6de 100644
--- a/config.js
+++ b/config.js
@@ -15,7 +15,7 @@ module.exports = {
// 应用名称
name: "智修小助手",
// 应用版本
- version: "1.6",
+ version: "1.7",
// 应用logo
logo: "/static/logo.png'",
// 官方网站
diff --git a/pages-order/orderDetail/orderDetail.vue b/pages-order/orderDetail/orderDetail.vue
index 9e9672e..f6bebc2 100644
--- a/pages-order/orderDetail/orderDetail.vue
+++ b/pages-order/orderDetail/orderDetail.vue
@@ -6,40 +6,41 @@
维修类别：
- {{ '维修保养' }}
+ {{ ticketInfo.repairTypeText }}
当前工单状态：
- {{ ticketInfo.ticketsStatus == '02' ? '已完成' : ticketInfo.statusStr }}
+ {{ ticketInfo.statusStr }}
+ {{ ticketInfo.statusStr }}
+ {{ ticketInfo.statusStr }}
车辆进厂时间：
- {{ '2024-11-20 12:00' }}
+ {{ ticketInfo.inTime }}
预计竣工时间：
- {{ '2024-11-21 12:00' }}
+ {{ ticketInfo.outTime }}
-
+
实际竣工时间：
- {{ '2024-11-21 12:00' }}
+ {{ ticketInfo.realOverDate }}
-
-
-
-
-
-
- {{ ticketInfo.ticketsStatus == '02' ? '已完成' : ticketInfo.statusStr }}
- 当前工单维修项目：{{ nowRepair.itemName }}
- 当前处理人：{{ ticketInfo.nowRepairName }}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -69,11 +70,11 @@
性别
{{ ticketInfo.customerInfo.sex === '1' ? '女' : '男' }}
-
+
经办人
{{ ticketInfo.handleName }}
-
+
经办人电话
{{ ticketInfo.handleMobile }}
@@ -84,7 +85,11 @@
发动机号
- {{ ticketInfo.fdjNo }}
+ {{ ticketInfo.carInfo.engineNumber }}
+
+
+ 车辆注册日期
+ {{ ticketInfo.carRegisterDate }}
年检到期时间
@@ -94,304 +99,215 @@
保险到期时间
{{ ticketInfo.insuranceExpiryDate}}
-
- 注册日期
- {{ ticketInfo.carRegisterDate }}
+
+ 最近保养日期
+ {{ ticketInfo.maintenanceDate}}
+
+
+ 最近保养公里数
+ {{ ticketInfo.maintenanceMileage}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ 维修工时项目
+
+
+
+
+
+ {{ item.itemName }}
+ ￥{{ item.itemMoney }}
+
+
+ 售价：
+ 数量：
+
+ 折扣：
+ 金额：
+
+
-
-
- 服务顾问：曾婷
- 施工人员：王雕、李志
-
-
-
- {{ index + 1 }}
- {{ item.name }}
+
+
+
+
+ 维修工时项目
+
+
+ {{ item.groupName }}
+
+
-
- {{ 6 + index }}
- {{ item.name }}
+
+
+ 服务顾问：{{ticketInfo.projectList[activeProjTabKey].servicer}}
+ 施工人员：{{ticketInfo.projectList[activeProjTabKey].worker}}
+
+
+
+ {{ index + 1 }}
+ {{ item.itemName }}
+
+
+ {{ 6 + index }}
+ {{ item.itemName }}
+
+
+
+ {{ ticketInfo.projectList[activeProjTabKey].showAll ? '收起' : '展开' }}
+
-
-
- {{ projTabList[activeProjTabKey].showAll ? '收起' : '展开' }}
-
-
- 更换配件清单
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 更换配件清单
+
+ 是否开放给客户
+
+
+
-
- {{ item.name }}
+
+ {{ item.groupName }}
-
-
- {{ index + 1 }}
- {{ item.name }}
- x2
-
-
- {{ 6 + index }}
- {{ item.name }}
- x2
-
-
-
- {{ partTabList[activePartTabKey].showAll ? '收起' : '展开' }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 更换配件清单 是否开放给客户
-
-
-
-
-
-
-
-
- {{ item.itemName }}
- ￥{{ item.itemMoney }}
-
-
- 售价：
- 数量：
- 单位：
- 折扣：
- 金额：{{ item.itemMoney || "" }}
-
-
-
-
- {{ item.itemName }}*{{item.itemCount || "0"}}{{item.unitText || ""}}-{{item.itemMoney|| "0"}}元({{ item.itemDiscount || "1" }}折)
- ￥{{ item.itemMoney }}
-
-
-
-
+
+
+
+
+
+
+ {{ item.itemName }}
+ ￥{{ item.itemMoney }}
+
+
+ 售价：
+ 数量：
+ 单位：
+ 折扣：
+ 金额：{{ item.itemMoney || "" }}
+
-
-
+
+
+
+
+
+
+
+ {{ index + 1 }}
+ {{ item.itemName }}
+ x{{ item.itemCount || "0" }}
+
+
+ {{ 6 + index }}
+ {{ item.itemName }}
+ x{{ item.itemCount || "0" }}
+
+
+
+ {{ ticketInfo.waresGroupList[activePartTabKey].showAll ? '收起' : '展开' }}
+
+
-
+
维修进度记录表
-
- 待维修
- 维修中
- 已完成
-
-
-
-
- {{ index + 1 }}
-
-
-
- {{ '日韩系国六零公里匠心0W-20' }}
- {{ '2024-11-28 12:00:00' }}
-
-
-
-
-
- 发送给客户
-
-
+
+
+ 待维修
+ 维修中
+ 已完成
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
维修记录
@@ -399,7 +315,6 @@
{{ item.type }}【{{item.roleName}}-{{item.dealUserName}}】
-
@@ -413,16 +328,11 @@
{{ item.remark }}
-
+
-
-
-
-
-
发送给客户
@@ -549,290 +459,7 @@ export default {
},
//删除的项目id、配件id
delProjId:[],
- projTabList: [
- {
- id: '01',
- name: '机电类',
- showAll: false,
- projList: [
- {
- id: '1',
- name: '日韩系国六零公里匠心0W-20'
- },
- {
- id: '2',
- name: '日韩系国六零公里匠心0W-20'
- },
- {
- id: '3',
- name: '日韩系国六零公里匠心0W-20'
- },
- {
- id: '4',
- name: '日韩系国六零公里匠心0W-20'
- },
- {
- id: '5',
- name: '日韩系国六零公里匠心0W-20'
- },
- {
- id: '6',
- name: '日韩系国六零公里匠心0W-20'
- },
- {
- id: '7',
- name: '日韩系国六零公里匠心0W-20'
- },
- {
- id: '8',
- name: '日韩系国六零公里匠心0W-20'
- }
- ]
- },
- {
- id: '02',
- name: '机电类',
- showAll: false,
- projList: [
- {
- id: '1',
- name: '日韩系国六零公里匠心0W-20'
- },
- {
- id: '2',
- name: '日韩系国六零公里匠心0W-20'
- },
- {
- id: '3',
- name: '日韩系国六零公里匠心0W-20'
- },
- {
- id: '4',
- name: '日韩系国六零公里匠心0W-20'
- },
- {
- id: '5',
- name: '日韩系国六零公里匠心0W-20'
- },
- {
- id: '6',
- name: '日韩系国六零公里匠心0W-20'
- },
- {
- id: '7',
- name: '日韩系国六零公里匠心0W-20'
- },
- {
- id: '8',
- name: '日韩系国六零公里匠心0W-20'
- }
- ]
- },
- {
- id: '03',
- name: '机电类',
- showAll: false,
- projList: [
- {
- id: '1',
- name: '日韩系国六零公里匠心0W-20'
- },
- {
- id: '2',
- name: '日韩系国六零公里匠心0W-20'
- },
- {
- id: '3',
- name: '日韩系国六零公里匠心0W-20'
- },
- {
- id: '4',
- name: '日韩系国六零公里匠心0W-20'
- },
- {
- id: '5',
- name: '日韩系国六零公里匠心0W-20'
- },
- {
- id: '6',
- name: '日韩系国六零公里匠心0W-20'
- },
- {
- id: '7',
- name: '日韩系国六零公里匠心0W-20'
- },
- {
- id: '8',
- name: '日韩系国六零公里匠心0W-20'
- }
- ]
- },
- {
- id: '04',
- name: '机电类',
- showAll: false,
- projList: [
- {
- id: '1',
- name: '日韩系国六零公里匠心0W-20'
- },
- {
- id: '2',
- name: '日韩系国六零公里匠心0W-20'
- },
- {
- id: '3',
- name: '日韩系国六零公里匠心0W-20'
- },
- {
- id: '4',
- name: '日韩系国六零公里匠心0W-20'
- },
- {
- id: '5',
- name: '日韩系国六零公里匠心0W-20'
- },
- {
- id: '6',
- name: '日韩系国六零公里匠心0W-20'
- },
- {
- id: '7',
- name: '日韩系国六零公里匠心0W-20'
- },
- {
- id: '8',
- name: '日韩系国六零公里匠心0W-20'
- }
- ]
- },
- {
- id: '05',
- name: '机电类',
- showAll: false,
- projList: [
- {
- id: '1',
- name: '日韩系国六零公里匠心0W-20'
- },
- {
- id: '2',
- name: '日韩系国六零公里匠心0W-20'
- },
- {
- id: '3',
- name: '日韩系国六零公里匠心0W-20'
- },
- {
- id: '4',
- name: '日韩系国六零公里匠心0W-20'
- },
- {
- id: '5',
- name: '日韩系国六零公里匠心0W-20'
- },
- {
- id: '6',
- name: '日韩系国六零公里匠心0W-20'
- },
- {
- id: '7',
- name: '日韩系国六零公里匠心0W-20'
- },
- {
- id: '8',
- name: '日韩系国六零公里匠心0W-20'
- }
- ]
- },
- {
- id: '06',
- name: '机电类',
- showAll: false,
- projList: [
- {
- id: '1',
- name: '日韩系国六零公里匠心0W-20'
- },
- {
- id: '2',
- name: '日韩系国六零公里匠心0W-20'
- },
- {
- id: '3',
- name: '日韩系国六零公里匠心0W-20'
- },
- {
- id: '4',
- name: '日韩系国六零公里匠心0W-20'
- },
- {
- id: '5',
- name: '日韩系国六零公里匠心0W-20'
- },
- {
- id: '6',
- name: '日韩系国六零公里匠心0W-20'
- },
- {
- id: '7',
- name: '日韩系国六零公里匠心0W-20'
- },
- {
- id: '8',
- name: '日韩系国六零公里匠心0W-20'
- }
- ]
- }
- ],
activeProjTabKey: 0,
- partTabList: [
- {
- id: '1',
- name: '机电类',
- detailList: [
- {
- id: '1',
- name: '铜铆钉/ALL'
- },
- {
- id: '2',
- name: '铜铆钉/ALL'
- },
- {
- id: '3',
- name: '铜铆钉/ALL'
- },
- {
- id: '4',
- name: '铜铆钉/ALL'
- },
- {
- id: '5',
- name: '铜铆钉/ALL'
- },
- {
- id: '6',
- name: '铜铆钉/ALL'
- }
- ]
- },
- {
- id: '2',
- name: '机电类',
- detailList: []
- },
- {
- id: '3',
- name: '机电类',
- detailList: []
- },
- {
- id: '4',
- name: '机电类',
- detailList: []
- }
- ],
activePartTabKey: 0,
processList: [{}, {}]
};
@@ -1468,6 +1095,24 @@ export default {
}else{
resultObj.carRegisterDate = '未知'
}
+ //进场日期
+ if (null != resultObj.inTime){
+ resultObj.inTime = formatDate(resultObj.inTime)
+ }else{
+ resultObj.inTime = '未知'
+ }
+ //最近保养日期
+ if (null != resultObj.maintenanceDate){
+ resultObj.maintenanceDate = formatDate(resultObj.maintenanceDate)
+ }else{
+ resultObj.maintenanceDate = '未知'
+ }
+ //预计竣工日期
+ if (null != resultObj.outTime){
+ resultObj.outTime = formatDate(resultObj.outTime)
+ }else{
+ resultObj.outTime = '未知'
+ }
//年检时间
console.log(resultObj.carInfo)
if (null != resultObj.carInfo.nextInspectionDate){
@@ -2028,7 +1673,100 @@ export default {
}
}
}
+ .projEditItem {
+ //margin-bottom: 25rpx;
+ padding: 0 20rpx 10rpx 20rpx;
+ border-bottom: 1rpx solid #F2F2F7;
+ //background: #F2F2F7;
+ border-radius: 4rpx 4rpx 4rpx 4rpx;
+ position: relative;
+ .del-proj-box{
+ position: absolute;
+ top: -10px;
+ right: -10px;
+ }
+ .del-wares-box{
+ position: absolute;
+ top: 0;
+ right: 0;
+ }
+ .projEditLine1 {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ font-weight: 500;
+ font-size: 28rpx;
+ color: #333333;
+
+ padding: 15rpx 0;
+
+ .projAmount {
+ color: #0174F6;
+ }
+ }
+
+ .projBaseInfo {
+ display: grid;
+ grid-template-columns: 1fr 1fr;
+ font-size: 28rpx;
+ color: #999999;
+ gap: 20rpx;
+ margin-bottom: 20rpx;
+ }
+
+ .projEditFoot {
+ padding: 10rpx 0;
+ border-top: 1px solid #DDDDDD;
+
+ display: flex;
+ align-items: center;
+ column-gap: 10rpx;
+
+ .block1, .block2 {
+ flex: 1;
+ width: 0;
+
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ column-gap: 8rpx;
+
+ font-size: 28rpx;
+ color: #0174F6;
+ line-height: 28rpx;
+
+ .editPeople {
+ flex: 1;
+ width: 0;
+
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+
+ .editForm {
+ display: flex;
+ flex-direction: column;
+ row-gap: 10rpx;
+ font-size: 28rpx;
+ color: #333333;
+
+ .label {
+ font-size: 28rpx;
+ color: #999999;
+ }
+ }
+ }
+ }
+
+ .line {
+ height: 28rpx;
+ width: 2rpx;
+ background-color: #DDDDDD;
+ }
+
+ }
+ }
.projDateCard, .partCard {
line-height: 1;
.projTabs {
@@ -2092,15 +1830,15 @@ export default {
column-gap: 10rpx;
}
.projSeq {
- width: 32rpx;
- height: 32rpx;
+ width: 40rpx;
+ height: 40rpx;
background: #0174F6;
border-radius: 18rpx 18rpx 18rpx 18rpx;
display: inline-block;
text-align: center;
- line-height: 32rpx;
+ line-height: 40rpx;
font-weight: 500;
- font-size: 28rpx;
+ font-size: 16px;
color: #FFFFFF;
}
.projName {
diff --git a/utils/utils.js b/utils/utils.js
index 1ea27fe..d9e840a 100644
--- a/utils/utils.js
+++ b/utils/utils.js
@@ -37,25 +37,25 @@ export function getOrderStatusText(ticketsStatus,workStatus){
let str = "";
if("04"==ticketsStatus){
//待派工
- str = "待派工"
+ str = "待维修"
}else if("05"==ticketsStatus){
//维修中
str = "维修中"
}else if("01"==ticketsStatus){
//待取车结算
- str = "待取车结算"
+ str = "已竣工"
}else if("06"==ticketsStatus){
//挂单/记账
- str = "已挂单/记账待交车"
+ str = "已结算"
}else if("07"==ticketsStatus){
//待通知客户取车
- str = "待通知客户取车"
+ str = "已竣工"
}else if("08"==ticketsStatus){
//已交车
str = "已交车"
}else if("02"==ticketsStatus){
//已结账
- str = "已结账待交车"
+ str = "已结算"
}else if("03"==ticketsStatus){
//已作废
str = "已作废"