From 73b4d0e18b6aaf1cdc39c22289047988fe8b7c6b Mon Sep 17 00:00:00 2001
From: Vinjor <vinjorm@gmail.com>
Date: Thu, 5 Dec 2024 14:46:37 +0800
Subject: [PATCH] 1

---
 config.js                               |   2 +-
 pages-order/orderDetail/orderDetail.vue | 916 +++++++++---------------
 utils/utils.js                          |  10 +-
 3 files changed, 333 insertions(+), 595 deletions(-)

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 @@
         <view class="orderInfo">
           <view class="orderTypeInfo">
             <text class="label">维修类别：</text>
-            <text class="value">{{ '维修保养' }}</text>
+            <text class="value" style="font-size: 35rpx">{{ ticketInfo.repairTypeText }}</text>
           </view>
           <view class="orderStateInfo">
             <text>当前工单状态：</text>
-            <text>{{ ticketInfo.ticketsStatus == '02' ? '已完成' : ticketInfo.statusStr }}</text>
+            <text v-if="ticketInfo.statusStr=='待维修' || ticketInfo.statusStr=='已作废'" >{{ ticketInfo.statusStr }}</text>
+            <text v-else-if="ticketInfo.statusStr=='维修中'" style="color: #E8A321">{{ ticketInfo.statusStr }}</text>
+            <text v-else style="color: #2979FF;">{{ ticketInfo.statusStr }}</text>
           </view>
           <view class="orderDateInfo">
             <text class="label">车辆进厂时间：</text>
-            <text class="value">{{ '2024-11-20 12:00' }}</text>
+            <text class="value">{{ ticketInfo.inTime }}</text>
           </view>
           <view class="orderDateInfo">
             <text class="label">预计竣工时间：</text>
-            <text class="value">{{ '2024-11-21 12:00' }}</text>
+            <text class="value">{{ ticketInfo.outTime }}</text>
           </view>
-          <view class="orderDateInfo">
+          <view class="orderDateInfo" v-if="ticketInfo.realOverDate">
             <text class="label">实际竣工时间：</text>
-            <text class="value">{{ '2024-11-21 12:00' }}</text>
+            <text class="value">{{ ticketInfo.realOverDate }}</text>
           </view>
         </view>
-
         <view class="card cardInfo carCard">
-          <view :class="{'end': ticketInfo.ticketsStatus == '02'}" class="orderFlag">
-            <template>
-              <image v-if="ticketInfo.ticketsStatus == '02'" mode="aspectFit" src="/static/icons/orderEnd.png"
-                     style="width: 48rpx;height: 48rpx"></image>
-              <image v-else mode="aspectFit" src="/static/icons/orderIng.png"
-                     style="width: 48rpx;height: 48rpx"></image>
-              <view class="flagBody">
-                <text>{{ ticketInfo.ticketsStatus == '02' ? '已完成' : ticketInfo.statusStr }}</text>
-                <text class="flagDesc" v-if="nowRepair.repairItemId">当前工单维修项目：{{ nowRepair.itemName }}</text>
-                <text class="flagDesc" v-if="ticketInfo.nowRepairName">当前处理人：{{ ticketInfo.nowRepairName }}</text>
-              </view>
-            </template>
-          </view>
+<!--          <view :class="{'end': ticketInfo.ticketsStatus == '02'}" class="orderFlag">-->
+<!--            <template>-->
+<!--              <image v-if="ticketInfo.ticketsStatus == '02'" mode="aspectFit" src="/static/icons/orderEnd.png"-->
+<!--                     style="width: 48rpx;height: 48rpx"></image>-->
+<!--              <image v-else mode="aspectFit" src="/static/icons/orderIng.png"-->
+<!--                     style="width: 48rpx;height: 48rpx"></image>-->
+<!--              <view class="flagBody">-->
+<!--                <text>{{ ticketInfo.ticketsStatus == '02' ? '已完成' : ticketInfo.statusStr }}</text>-->
+<!--                <text class="flagDesc" v-if="nowRepair.repairItemId">当前工单维修项目：{{ nowRepair.itemName }}</text>-->
+<!--                <text class="flagDesc" v-if="ticketInfo.nowRepairName">当前处理人：{{ ticketInfo.nowRepairName }}</text>-->
+<!--              </view>-->
+<!--            </template>-->
+<!--          </view>-->
 <!--          <view v-if="wares && wares.length>0" v-for="item in wares" class="noReviewPart" @click="showReviewList(item)">-->
 <!--            <u-icon color="#E8A321" name="error-circle-fill" size="14"></u-icon>-->
 <!--            <text class="messageText">当前项目有待审批的配件申请单！</text>-->
@@ -69,11 +70,11 @@
                   <text class="label">性别</text>
                   <text class="value">{{ ticketInfo.customerInfo.sex === '1' ? '女' : '男' }}</text>
                 </view>
-                <view class="infoItem">
+                <view class="infoItem" v-if="ticketInfo.handleName">
                   <text class="label">经办人</text>
                   <text class="value">{{ ticketInfo.handleName }}</text>
                 </view>
-                <view class="infoItem">
+                <view class="infoItem" v-if="ticketInfo.handleMobile">
                   <text class="label">经办人电话</text>
                   <text class="value">{{ ticketInfo.handleMobile }}</text>
                 </view>
@@ -84,7 +85,11 @@
                 </view>
                 <view class="infoItem">
                   <view class="label">发动机号</view>
-                  <view class="value">{{ ticketInfo.fdjNo }}</view>
+                  <view class="value">{{ ticketInfo.carInfo.engineNumber }}</view>
+                </view>
+                <view class="infoItem">
+                  <view class="label">车辆注册日期</view>
+                  <view class="value">{{ ticketInfo.carRegisterDate }}</view>
                 </view>
                 <view class="infoItem">
                   <view class="label">年检到期时间</view>
@@ -94,304 +99,215 @@
                   <view class="label">保险到期时间</view>
                   <view class="value">{{ ticketInfo.insuranceExpiryDate}}</view>
                 </view>
-                <view class="infoItem" style="flex: 1">
-                  <view class="label">注册日期</view>
-                  <view class="value">{{ ticketInfo.carRegisterDate }}</view>
+                <view class="infoItem">
+                  <view class="label">最近保养日期</view>
+                  <view class="value">{{ ticketInfo.maintenanceDate}}</view>
+                </view>
+                <view class="infoItem">
+                  <view class="label">最近保养公里数</view>
+                  <view class="value">{{ ticketInfo.maintenanceMileage}}</view>
                 </view>
               </view>
-              <!--<template v-if="carInfo.showAll">-->
-              <!--  <view style="display: flex;align-items: center">-->
-                  <!--<view class="infoItem" style="flex: 1">-->
-                  <!--  <view class="label">年检到期时间</view>-->
-                  <!--  <view class="value">{{ ticketInfo.nextInspectionDate}}</view>-->
-                  <!--</view>-->
-                  <!--<view class="infoItem" style="flex: 1">-->
-                  <!--  <view class="label">保险到期时间</view>-->
-                  <!--  <view class="value">{{ ticketInfo.insuranceExpiryDate}}</view>-->
-                  <!--</view>-->
-                <!--</view>-->
-
-              <!--</template>-->
             </view>
-            <!--<view class="carFoot">-->
-            <!--  <template v-if="!carInfo.showAll">-->
-            <!--    <text @click="() => $set(carInfo, 'showAll', true)">展开</text>-->
-            <!--    <image mode="aspectFit" src="/static/icons/bottom.png" style="width: 28rpx;height: 28rpx"></image>-->
-            <!--  </template>-->
-            <!--  <template v-else>-->
-            <!--    <text @click="() => carInfo.showAll = false">收起</text>-->
-            <!--    &lt;!&ndash;<image mode="aspectFit" src="/static/icons/bottom.png" style="width: 28rpx;height: 28rpx"></image>&ndash;&gt;-->
-            <!--  </template>-->
-            <!--</view>-->
           </view>
         </view>
-        <!--<view class="card cardInfo userCard">-->
-        <!--  <view class="userTitle">客户信息</view>-->
-        <!--  <view class="userContainer">-->
-        <!--    <view style="display: flex;align-items: center">-->
-        <!--      &lt;!&ndash;<view class="infoItem" style="flex: 1">&ndash;&gt;-->
-        <!--      &lt;!&ndash;  <text class="label">姓名</text>&ndash;&gt;-->
-        <!--      &lt;!&ndash;  <text class="value">{{ ticketInfo.userName }}</text>&ndash;&gt;-->
-        <!--      &lt;!&ndash;</view>&ndash;&gt;-->
-        <!--      &lt;!&ndash;<view class="infoItem" style="flex: 1">&ndash;&gt;-->
-        <!--      &lt;!&ndash;  <text class="label">性别</text>&ndash;&gt;-->
-        <!--      &lt;!&ndash;  <text class="value">{{ ticketInfo.customerInfo.sex === '1' ? '女' : '男' }}</text>&ndash;&gt;-->
-        <!--      &lt;!&ndash;</view>&ndash;&gt;-->
-        <!--    </view>-->
-        <!--    <view v-if="ticketInfo.userName!=ticketInfo.handleName" style="display: flex;align-items: center">-->
-        <!--      &lt;!&ndash;<view class="infoItem" style="flex: 1">&ndash;&gt;-->
-        <!--      &lt;!&ndash;  <text class="label">经办人姓名</text>&ndash;&gt;-->
-        <!--      &lt;!&ndash;  <text class="value">{{ ticketInfo.handleName }}</text>&ndash;&gt;-->
-        <!--      &lt;!&ndash;</view>&ndash;&gt;-->
-        <!--      &lt;!&ndash;<view class="infoItem" style="flex: 1">&ndash;&gt;-->
-        <!--      &lt;!&ndash;  <text class="label">经办人电话</text>&ndash;&gt;-->
-        <!--      &lt;!&ndash;  <text class="value">{{ ticketInfo.handleMobile }}</text>&ndash;&gt;-->
-        <!--      &lt;!&ndash;</view>&ndash;&gt;-->
-        <!--    </view>-->
-        <!--    <template v-if="userInfo.showAll">-->
-        <!--      <view style="display: flex;align-items: center">-->
-        <!--        &lt;!&ndash;<view class="infoItem" style="flex: 1">&ndash;&gt;-->
-        <!--        &lt;!&ndash;  <text class="label">联系方式</text>&ndash;&gt;-->
-        <!--        &lt;!&ndash;  <text class="value">{{ ticketInfo.userMobile }}</text>&ndash;&gt;-->
-        <!--        &lt;!&ndash;</view>&ndash;&gt;-->
-        <!--        <view class="infoItem" style="flex: 1">-->
-        <!--          <text class="label">生日</text>-->
-        <!--          <text class="value">{{ ticketInfo.birthday }}</text>-->
-        <!--        </view>-->
-        <!--      </view>-->
-        <!--      <view class="infoItem">-->
-        <!--        <text class="label">联系地址</text>-->
-        <!--        <text class="value">-->
-        <!--          {{ ticketInfo.customerInfo.address }}-->
-        <!--        </text>-->
-        <!--      </view>-->
-        <!--    </template>-->
-        <!--  </view>-->
-        <!--  <view v-if="loginUser.roleCodes.includes('weixiu') || loginUser.roleCodes.includes('service_advisor')||loginUser.roleCodes.includes('general_inspection')" class="userFoot">-->
-        <!--    <template v-if="!userInfo.showAll">-->
-        <!--      <text @click="() => $set(userInfo, 'showAll', true)">展开</text>-->
-        <!--      <image mode="aspectFit" src="/static/icons/bottom.png" style="width: 28rpx;height: 28rpx"></image>-->
-        <!--    </template>-->
-        <!--    <template v-else>-->
-        <!--      <text @click="() => userInfo.showAll = false">收起</text>-->
-        <!--      &lt;!&ndash;<image mode="aspectFit" src="/static/icons/bottom.png" style="width: 28rpx;height: 28rpx"></image>&ndash;&gt;-->
-        <!--    </template>-->
-        <!--  </view>-->
-        <!--</view>-->
+        <!-- 维修工时项目-编辑 -->
+        <view v-if="(loginUser.roleCodes.includes('weixiu') || loginUser.roleCodes.includes('service_advisor')||loginUser.roleCodes.includes('general_inspection')) && isDetail == '0'">
+          <view v-if="ticketInfo.projects && ticketInfo.projects.length > 0 " class="card cardInfo projCard">
+            <view class="projTitle">维修工时项目</view>
+            <view class="projList">
+              <template>
+                <view v-for="(item,index) in ticketInfo.projects" :key="item.id" class="projEditItem">
+                  <view  class="del-proj-box" @click="delProj(item.id,index)"><uni-icons type="trash" size="25" style="color: #0174F6"></uni-icons></view>
+                  <view class="projEditLine1">
+                    <text>{{ item.itemName }}</text>
+                    <text v-if="canSeeMoney"  class="projAmount">￥{{ item.itemMoney }}</text>
+                  </view>
+                  <view  class="projBaseInfo" >
+                    <view v-if="canSeeMoney">售价：<input class="edit-proj-input" @input="onKeyInput('sj',item)" type="decimal" placeholder="请输入售价" v-model="item.itemPrice" /></view>
+                    <view>数量：<input class="edit-proj-input" @input="onKeyInput('sl',item)" type="number" placeholder="请输入数量" v-model="item.itemCount" /></view>
+                    <!--                  <view>单位：{{ item.itemUnit}}</view>-->
+                    <view v-if="canSeeMoney">折扣：<input class="edit-proj-input" @input="onKeyInput('zk',item)" type="decimal" placeholder="请输入折扣（0-1）" v-model="item.itemDiscount" /></view>
+                    <view v-if="canSeeMoney">金额：<input  type="number" disabled placeholder="请输入售价" v-model="item.itemMoney" /></view>
+                  </view>
+                  <view class="projEditFoot">
+                    <view class="block1">
+                      <template>
+                        <view class="editPeople">
+                          <view class="editForm">
+                            <text class="label">服务顾问</text>
+                            <text >{{item.saleName || ""}}
+                            </text>
+                          </view>
+                          <image  src="/static/icons/edit.png" style="width: 28rpx;height: 28rpx"
+                                 @click="editPeople('xs', item)"></image>
+                        </view>
+                      </template>
+                      <template >
+                        <image @click="editPeople('xs', item)"src="/pages-order/static/addIcon.png" style="width: 28rpx;height: 28rpx"></image>
+                        <!--                      <text class="addText" @click="editPeople('xs', item)">添加服务顾问</text>-->
+                      </template>
+                    </view>
+                    <view class="line"></view>
+                    <view class="block2">
+                      <template>
+                        <view class="editPeople">
+                          <view class="editForm">
+                            <text class="label">施工人员</text>
+                            <text >{{ item.repairNames || ""}}</text>
+                          </view>
+                          <image  src="/static/icons/edit.png" style="width: 28rpx;height: 28rpx"
+                                 @click="editPeople('sg', item)"></image>
+                        </view>
+                      </template>
+                      <template>
+                        <image @click="editPeople('sg', item)" src="/pages-order/static/addIcon.png" style="width: 28rpx;height: 28rpx"></image>
+                        <!--                      <text class="addText" @click="editPeople('sg', item)">添加施工人员</text>-->
+                      </template>
 
-        <view class="card projDateCard" v-if="projTabList && projTabList.length > 0">
-          <view class="projTitle">维修工时项目</view>
-          <view class="projTabs">
-            <view @click="chooseProjTab(index)" v-for="(item, index) in projTabList" :key="item.id" class="projTabItem" :class="{ active: index === activeProjTabKey }">
-              {{ item.name }}
-              <view v-if="index === activeProjTabKey" class="activeLine"></view>
+                    </view>
+                  </view>
+                </view>
+              </template>
             </view>
           </view>
-          <view class="projTabsBottomLine"></view>
-          <view class="workPerson">
-            <text>服务顾问：曾婷</text>
-            <text>施工人员：王雕、李志</text>
-          </view>
-          <view class="projList">
-            <view class="projItem" v-for="(item, index) in projTabList[activeProjTabKey].projList.slice(0, 5)" :key="item.id">
-              <text class="projSeq">{{ index + 1 }}</text>
-              <text class="projName">{{ item.name }}</text>
+        </view>
+        <!-- 维修工时项目-只读 -->
+        <view v-else>
+          <view class="card projDateCard" v-if="ticketInfo.projectList && ticketInfo.projectList.length > 0">
+            <view class="projTitle">维修工时项目</view>
+            <view class="projTabs">
+              <view @click="chooseProjTab(index)" v-for="(item, index) in ticketInfo.projectList" :key="item.groupId" class="projTabItem" :class="{ active: index === activeProjTabKey }">
+                {{ item.groupName }}
+                <view v-if="index === activeProjTabKey" class="activeLine"></view>
+              </view>
             </view>
-            <view v-if="projTabList[activeProjTabKey].showAll" class="projItem" v-for="(item, index) in projTabList[activeProjTabKey].projList.slice(5, projTabList[activeProjTabKey].projList.length)" :key="item.id">
-              <text class="projSeq">{{ 6 + index }}</text>
-              <text class="projName">{{ item.name }}</text>
+            <view class="projTabsBottomLine"></view>
+            <view class="workPerson">
+              <text>服务顾问：{{ticketInfo.projectList[activeProjTabKey].servicer}}</text>
+              <text>施工人员：{{ticketInfo.projectList[activeProjTabKey].worker}}</text>
+            </view>
+            <view class="projList">
+              <view class="projItem" v-for="(item, index) in ticketInfo.projectList[activeProjTabKey].wares.slice(0, 5)" :key="item.id">
+                <text class="projSeq">{{ index + 1 }}</text>
+                <text class="projName">{{ item.itemName }}</text>
+              </view>
+              <view v-if="ticketInfo.projectList[activeProjTabKey].showAll" class="projItem" v-for="(item, index) in ticketInfo.projectList[activeProjTabKey].wares.slice(5, ticketInfo.projectList[activeProjTabKey].wares.length)" :key="item.id">
+                <text class="projSeq">{{ 6 + index }}</text>
+                <text class="projName">{{ item.itemName }}</text>
+              </view>
+            </view>
+            <view v-if="ticketInfo.projectList[activeProjTabKey].wares.length > 5" class="action" @click="() => $set(ticketInfo.projectList[activeProjTabKey], 'showAll', !ticketInfo.projectList[activeProjTabKey].showAll)">
+              <text>{{ ticketInfo.projectList[activeProjTabKey].showAll ? '收起' : '展开' }}</text>
+              <uni-icons :type="ticketInfo.projectList[activeProjTabKey].showAll ? 'top' : 'bottom'" color="#0174f6"></uni-icons>
             </view>
-          </view>
-          <view v-if="projTabList[activeProjTabKey].projList.length > 5" class="action" @click="() => $set(projTabList[activeProjTabKey], 'showAll', !projTabList[activeProjTabKey].showAll)">
-            <text>{{ projTabList[activeProjTabKey].showAll ? '收起' : '展开' }}</text>
-            <uni-icons :type="projTabList[activeProjTabKey].showAll ? 'top' : 'bottom'" color="#0174f6"></uni-icons>
           </view>
         </view>
 
-        <view class="card partCard" v-if="partTabList && partTabList.length > 0">
-          <view class="projTitle">更换配件清单</view>
+        <!-- 更换配件清单-编辑 -->
+<!--        <view v-if="loginUser.roleCodes.includes('repair_warehouse') && isDetail == '0'">-->
+<!--          <view v-if="ticketInfo.waresGroupList && ticketInfo.waresGroupList.length > 0" class="card cardInfo projCard">-->
+<!--            <view class="projTitle">更换配件清单 <view class="dl-ifcus" v-if="canOpenCus"><text>是否开放给客户</text><switch :checked="ticketInfo.partShow == '1'" style="transform:scale(0.7)" @change="toPartShow" /></view></view>-->
+<!--            <view class="projList">-->
+<!--              <uni-collapse ref="collapse" >-->
+<!--                <uni-collapse-item v-for="(groupItem,groupIndex) in ticketInfo.waresGroupList" :key="groupItem.groupId" :title="groupItem.groupName+'('+groupItem.nums+'类配件，合计：'+groupItem.totalAmount+'元)'" >-->
+<!--                  <view class="content">-->
+<!--                    <template>-->
+<!--                      <view v-for="(item,index) in groupItem.wares" :key="item.id" class="projEditItem">-->
+<!--                        <view >-->
+<!--                          <view class="projEditLine1">-->
+<!--                            <text>{{ item.itemName }}</text>-->
+<!--                            <text  class="projAmount"><text v-if="canSeeMoney">￥{{ item.itemMoney }}</text><uni-icons @click="delWares(item,groupIndex,index)" type="trash" size="25" style="color: #0174F6"></uni-icons></text>-->
+<!--                          </view>-->
+<!--                          <view class="projBaseInfo"  >-->
+<!--                            <view v-if="canSeeMoney">售价：<input @input="onKeyInput('sj',item)" style="background: white;padding: 0 10rpx" type="decimal" placeholder="请输入售价" v-model="item.itemPrice" /></view>-->
+<!--                            <view>数量：<input @input="onKeyInput('sl',item)" style="background: white;padding: 0 10rpx" type="number" placeholder="请输入数量" v-model="item.itemCount" /></view>-->
+<!--                            <view>单位：<input  style="padding: 0 10rpx" type="text"  v-model="item.unitText" disabled /></view>-->
+<!--                            <view v-if="canSeeMoney">折扣：<input @input="onKeyInput('zk',item)" style="background: white;padding: 0 10rpx" type="decimal" placeholder="请输入折扣（0-1）" v-model="item.itemDiscount" /></view>-->
+<!--                            <view v-if="canSeeMoney">金额：{{ item.itemMoney || "" }}</view>-->
+<!--                          </view>-->
+<!--                        </view>-->
+<!--                      </view>-->
+<!--                    </template>-->
+<!--                  </view>-->
+<!--                </uni-collapse-item>-->
+<!--              </uni-collapse>-->
+<!--            </view>-->
+<!--          </view>-->
+<!--        </view>-->
+        <!-- 更换配件清单 -->
+        <view class="card partCard" v-if="ticketInfo.waresGroupList && ticketInfo.waresGroupList.length > 0">
+          <view class="projTitle">更换配件清单
+            <view class="dl-ifcus" v-if="canOpenCus">
+              <text>是否开放给客户</text>
+              <switch :checked="ticketInfo.partShow == '1'" style="transform:scale(0.7)" @change="toPartShow"/>
+            </view>
+          </view>
           <view class="projTabs">
-            <view @click="choosePartTab(index)" v-for="(item, index) in partTabList" :key="item.id" class="projTabItem" :class="{ active: index === activePartTabKey }">
-              {{ item.name }}
+            <view @click="choosePartTab(index)" v-for="(item, index) in ticketInfo.waresGroupList" :key="item.groupId"
+                  class="projTabItem" :class="{ active: index === activePartTabKey }">
+              {{ item.groupName }}
               <view v-if="index === activePartTabKey" class="activeLine"></view>
             </view>
           </view>
           <view class="projTabsBottomLine" style="margin-bottom: 0"></view>
-          <view class="projList">
-            <view class="projItem" v-for="(item, index) in partTabList[activePartTabKey].detailList.slice(0, 5)" :key="item.id">
-              <text class="projSeq">{{ index + 1 }}</text>
-              <text class="projName">{{ item.name }}</text>
-              <text style="color: #636C8C;font-size: 32rpx;">x2</text>
-            </view>
-            <view v-if="partTabList[activePartTabKey].showAll" class="projItem" v-for="(item, index) in partTabList[activePartTabKey].detailList.slice(5, partTabList[activePartTabKey].detailList.length)" :key="item.id">
-              <text class="projSeq">{{ 6 + index }}</text>
-              <text class="projName">{{ item.name }}</text>
-              <text style="color: #636C8C;font-size: 32rpx;">x2</text>
-            </view>
-          </view>
-          <view v-if="partTabList[activePartTabKey].detailList.length > 5" class="action" @click="() => $set(partTabList[activePartTabKey], 'showAll', !partTabList[activePartTabKey].showAll)">
-            <text>{{ partTabList[activePartTabKey].showAll ? '收起' : '展开' }}</text>
-            <uni-icons :type="partTabList[activePartTabKey].showAll ? 'top' : 'bottom'" color="#0174f6"></uni-icons>
-          </view>
-        </view>
-
-<!--        <view v-if="ticketInfo.projects && ticketInfo.projects.length > 0" class="card cardInfo projCard">-->
-<!--          <view class="projTitle">维修工时项目</view>-->
-<!--          <view class="projList">-->
-<!--            <template>-->
-<!--              <view v-for="(item,index) in ticketInfo.projects" :key="item.id" class="projEditItem">-->
-<!--                <view v-if="(loginUser.roleCodes.includes('weixiu') || loginUser.roleCodes.includes('service_advisor')||loginUser.roleCodes.includes('general_inspection')) && isDetail == '0'" class="del-proj-box" @click="delProj(item.id,index)"><uni-icons type="trash" size="25" style="color: #0174F6"></uni-icons></view>-->
-<!--                <view class="projEditLine1">-->
-<!--                  <text>{{ item.itemName }}</text>-->
-<!--                  <text v-if="canSeeMoney"  class="projAmount">￥{{ item.itemMoney }}</text>-->
-<!--                </view>-->
-<!--                <view  class="projBaseInfo" v-if="(loginUser.roleCodes.includes('weixiu') || loginUser.roleCodes.includes('service_advisor')||loginUser.roleCodes.includes('general_inspection')) && isDetail == '0'" >-->
-<!--                    &lt;!&ndash; 可编辑&ndash;&gt;-->
-<!--                    <view v-if="canSeeMoney">售价：<input class="edit-proj-input" @input="onKeyInput('sj',item)" type="decimal" placeholder="请输入售价" v-model="item.itemPrice" /></view>-->
-<!--                    <view>数量：<input class="edit-proj-input" @input="onKeyInput('sl',item)" type="number" placeholder="请输入数量" v-model="item.itemCount" /></view>-->
-<!--                    &lt;!&ndash;                  <view>单位：{{ item.itemUnit}}</view>&ndash;&gt;-->
-<!--                    <view v-if="canSeeMoney">折扣：<input class="edit-proj-input" @input="onKeyInput('zk',item)" type="decimal" placeholder="请输入折扣（0-1）" v-model="item.itemDiscount" /></view>-->
-<!--                    <view v-if="canSeeMoney">金额：<input  type="number" disabled placeholder="请输入售价" v-model="item.itemMoney" /></view>-->
-<!--                </view>-->
-<!--                <view v-else class="projBaseInfo" >-->
-<!--                    &lt;!&ndash; 只读 &ndash;&gt;-->
-<!--                    <view v-if="canSeeMoney">售价：{{ item.itemPrice || "" }}</view>-->
-<!--                    <view>数量：{{ item.itemCount || "" }}</view>-->
-<!--                    &lt;!&ndash;                  <view>单位：{{ item.itemUnit}}</view>&ndash;&gt;-->
-<!--                    <view v-if="canSeeMoney">折扣：{{ item.itemDiscount || "" }}</view>-->
-<!--                    <view v-if="canSeeMoney">金额：{{ item.itemMoney || "" }}</view>-->
-<!--                </view>-->
-<!--                <view class="projEditFoot">-->
-<!--                  <view class="block1">-->
-<!--                    <template>-->
-<!--                      <view class="editPeople">-->
-<!--                        <view class="editForm">-->
-<!--                          <text class="label">服务顾问</text>-->
-<!--                          <text >{{item.saleName || ""}}-->
-<!--                          </text>-->
-<!--                        </view>-->
-<!--                        <image v-if="(loginUser.roleCodes.includes('weixiu') || loginUser.roleCodes.includes('service_advisor')||loginUser.roleCodes.includes('general_inspection')) && isDetail == '0'" src="/static/icons/edit.png" style="width: 28rpx;height: 28rpx"-->
-<!--                               @click="editPeople('xs', item)"></image>-->
-<!--                      </view>-->
-<!--                    </template>-->
-<!--                    <template v-if="(loginUser.roleCodes.includes('weixiu') || loginUser.roleCodes.includes('service_advisor')||loginUser.roleCodes.includes('general_inspection')) && isDetail == '0'">-->
-<!--                      <image @click="editPeople('xs', item)"src="/pages-order/static/addIcon.png" style="width: 28rpx;height: 28rpx"></image>-->
-<!--&lt;!&ndash;                      <text class="addText" @click="editPeople('xs', item)">添加服务顾问</text>&ndash;&gt;-->
-<!--                    </template>-->
-<!--                  </view>-->
-<!--                  <view class="line"></view>-->
-<!--                  <view class="block2">-->
-<!--                    <template>-->
-<!--                      <view class="editPeople">-->
-<!--                        <view class="editForm">-->
-<!--                          <text class="label">施工人员</text>-->
-<!--                          <text >{{ item.repairNames || ""}}</text>-->
-<!--                        </view>-->
-<!--                        <image v-if="(loginUser.roleCodes.includes('weixiu') || loginUser.roleCodes.includes('service_advisor')||loginUser.roleCodes.includes('general_inspection')) && isDetail == '0'" src="/static/icons/edit.png" style="width: 28rpx;height: 28rpx"-->
-<!--                               @click="editPeople('sg', item)"></image>-->
-<!--                      </view>-->
-<!--                    </template>-->
-<!--                    <template v-if="(loginUser.roleCodes.includes('weixiu') || loginUser.roleCodes.includes('service_advisor')||loginUser.roleCodes.includes('general_inspection')) && isDetail == '0'">-->
-<!--                      <image @click="editPeople('sg', item)" src="/pages-order/static/addIcon.png" style="width: 28rpx;height: 28rpx"></image>-->
-<!--&lt;!&ndash;                      <text class="addText" @click="editPeople('sg', item)">添加施工人员</text>&ndash;&gt;-->
-<!--                    </template>-->
-
-<!--                  </view>-->
-<!--                </view>-->
-<!--              </view>-->
-<!--            </template>-->
-<!--          </view>-->
-<!--        </view>-->
-        <view v-if="ticketInfo.waresGroupList && ticketInfo.waresGroupList.length > 0" class="card cardInfo projCard">
-          <view class="projTitle">更换配件清单 <view class="dl-ifcus" v-if="canOpenCus"><text>是否开放给客户</text><switch :checked="ticketInfo.partShow == '1'" style="transform:scale(0.7)" @change="toPartShow" /></view></view>
-          <view class="projList">
-            <uni-collapse ref="collapse" >
-              <uni-collapse-item v-for="(groupItem,groupIndex) in ticketInfo.waresGroupList" :key="groupItem.groupId" :title="groupItem.groupName+'('+groupItem.nums+'类配件，合计：'+groupItem.totalAmount+'元)'" >
-                <view class="content">
-                  <template>
-                    <view v-for="(item,index) in groupItem.wares" :key="item.id" class="projEditItem">
-                      <view v-if="loginUser.roleCodes.includes('repair_warehouse') && isDetail == '0'">
-                        <view class="projEditLine1">
-                          <text>{{ item.itemName }}</text>
-                          <text  class="projAmount"><text v-if="canSeeMoney">￥{{ item.itemMoney }}</text><uni-icons @click="delWares(item,groupIndex,index)" type="trash" size="25" style="color: #0174F6"></uni-icons></text>
-                        </view>
-                        <view class="projBaseInfo"  >
-                          <view v-if="canSeeMoney">售价：<input @input="onKeyInput('sj',item)" style="background: white;padding: 0 10rpx" type="decimal" placeholder="请输入售价" v-model="item.itemPrice" /></view>
-                          <view>数量：<input @input="onKeyInput('sl',item)" style="background: white;padding: 0 10rpx" type="number" placeholder="请输入数量" v-model="item.itemCount" /></view>
-                          <view>单位：<input  style="padding: 0 10rpx" type="text"  v-model="item.unitText" disabled /></view>
-                          <view v-if="canSeeMoney">折扣：<input @input="onKeyInput('zk',item)" style="background: white;padding: 0 10rpx" type="decimal" placeholder="请输入折扣（0-1）" v-model="item.itemDiscount" /></view>
-                          <view v-if="canSeeMoney">金额：{{ item.itemMoney || "" }}</view>
-                        </view>
-                      </view>
-                      <view v-else>
-                        <view class="projEditLine1">
-                          <text>{{ item.itemName }}*{{item.itemCount || "0"}}{{item.unitText || ""}}-{{item.itemMoney|| "0"}}元({{ item.itemDiscount || "1" }}折)</text>
-                          <text v-if="canSeeMoney" class="projAmount">￥{{ item.itemMoney }}</text>
-                        </view>
-                      </view>
-                    </view>
-                  </template>
+          <view v-if="loginUser.roleCodes.includes('repair_warehouse') && isDetail == '0'">
+<!--            编辑状态-->
+            <template>
+              <view v-for="(item,index) in ticketInfo.waresGroupList[activePartTabKey].wares" :key="item.id" class="projEditItem">
+                <view >
+                  <view class="projEditLine1">
+                    <text>{{ item.itemName }}</text>
+                    <text  class="projAmount"><text v-if="canSeeMoney">￥{{ item.itemMoney }}</text><uni-icons @click="delWares(item,groupIndex,index)" type="trash" size="25" style="color: #0174F6"></uni-icons></text>
+                  </view>
+                  <view class="projBaseInfo"  >
+                    <view v-if="canSeeMoney">售价：<input @input="onKeyInput('sj',item)" style="background: #F2F2F7;padding: 0 10rpx" type="decimal" placeholder="请输入售价" v-model="item.itemPrice" /></view>
+                    <view>数量：<input @input="onKeyInput('sl',item)" style="background: #F2F2F7;padding: 0 10rpx" type="number" placeholder="请输入数量" v-model="item.itemCount" /></view>
+                    <view>单位：<input  style="padding: 0 10rpx" type="text"  v-model="item.unitText" disabled /></view>
+                    <view v-if="canSeeMoney">折扣：<input @input="onKeyInput('zk',item)" style="background: #F2F2F7;padding: 0 10rpx" type="decimal" placeholder="请输入折扣（0-1）" v-model="item.itemDiscount" /></view>
+                    <view v-if="canSeeMoney">金额：{{ item.itemMoney || "" }}</view>
+                  </view>
                 </view>
-              </uni-collapse-item>
-            </uni-collapse>
+              </view>
+            </template>
+          </view>
+          <view v-else>
+<!--            只读状态-->
+            <view class="projList">
+              <view class="projItem"
+                    v-for="(item, index) in ticketInfo.waresGroupList[activePartTabKey].wares.slice(0, 5)" :key="item.id">
+                <text class="projSeq">{{ index + 1 }}</text>
+                <text class="projName">{{ item.itemName }}</text>
+                <text style="color: #636C8C;font-size: 32rpx;">x{{ item.itemCount || "0" }}</text>
+              </view>
+              <view v-if="ticketInfo.waresGroupList[activePartTabKey].showAll" class="projItem"
+                    v-for="(item, index) in ticketInfo.waresGroupList[activePartTabKey].wares.slice(5, ticketInfo.waresGroupList[activePartTabKey].wares.length)"
+                    :key="item.id">
+                <text class="projSeq">{{ 6 + index }}</text>
+                <text class="projName">{{ item.itemName }}</text>
+                <text style="color: #636C8C;font-size: 32rpx;">x{{ item.itemCount || "0" }}</text>
+              </view>
+            </view>
+            <view v-if="ticketInfo.waresGroupList[activePartTabKey].wares.length > 5" class="action"
+                  @click="() => $set(ticketInfo.waresGroupList[activePartTabKey], 'showAll', !ticketInfo.waresGroupList[activePartTabKey].showAll)">
+              <text>{{ ticketInfo.waresGroupList[activePartTabKey].showAll ? '收起' : '展开' }}</text>
+              <uni-icons :type="ticketInfo.waresGroupList[activePartTabKey].showAll ? 'top' : 'bottom'"
+                         color="#0174f6"></uni-icons>
+            </view>
           </view>
         </view>
 
-        <view class="card processCard">
+        <view v-if="isDetail == '1'" class="card cardInfo projCard">
           <view class="projTitle">维修进度记录表</view>
-          <view class="tushi-box">
-            <view class="tushi-item" style="color: #B7BDC6">待维修  </view>
-            <view class="tushi-item" style="color: #E8A321">维修中  </view>
-            <view class="tushi-item" style="color: #2979FF;">已完成</view>
-          </view>
-          <view class="processList">
-            <view class="processItem" v-for="(item, index) in processList.length" :key="item">
-              <view class="left">
-                <text class="processSeq">{{ index + 1 }}</text>
-                <view v-if="index < processList.length - 1" class="line"></view>
-              </view>
-              <view class="right">
-                <text class="processName">{{ '日韩系国六零公里匠心0W-20' }}</text>
-                <text class="processDate">{{ '2024-11-28 12:00:00' }}</text>
-                <view class="processImgList">
-                  <image class="processImgItem" src=""></image>
-                </view>
-                <view class="processSendUser">
-                  <image mode="aspectFit" src="/static/icons/send.png" style="width: 28rpx;height: 28rpx"></image>
-                  发送给客户
-                </view>
-              </view>
+          <view class="projList">
+            <view class="tushi-box">
+              <view class="tushi-item" style="color: #B7BDC6">待维修  </view>
+              <view class="tushi-item" style="color: #E8A321">维修中  </view>
+              <view class="tushi-item" style="color: #2979FF;">已完成</view>
             </view>
+            <uni-steps :canOpenCus="canOpenCus" :options="list2" active-color="#007AFF" :active="active" :doingActive="doingActive" direction="column" @prviewImage="prviewImage" @sendCusImgManage="sendCusImgManage"/>
           </view>
         </view>
-
-<!--        <view v-if="isDetail == '1'" class="card cardInfo projCard">-->
-<!--          <view class="projTitle">维修进度记录表</view>-->
-<!--          <view class="projList">-->
-<!--            <view class="tushi-box">-->
-<!--              <view class="tushi-item" style="color: #B7BDC6">待维修  </view>-->
-<!--              <view class="tushi-item" style="color: #E8A321">维修中  </view>-->
-<!--              <view class="tushi-item" style="color: #2979FF;">已完成</view>-->
-<!--            </view>-->
-<!--            <uni-steps :canOpenCus="canOpenCus" :options="list2" active-color="#007AFF" :active="active" :doingActive="doingActive" direction="column" @prviewImage="prviewImage" @sendCusImgManage="sendCusImgManage"/>-->
-<!--&lt;!&ndash;            <uni-table ref="table" :loading="false" border stripe  emptyText="暂无数据">&ndash;&gt;-->
-<!--&lt;!&ndash;              <uni-tr>&ndash;&gt;-->
-<!--&lt;!&ndash;                <uni-th width="50" align="center">序号</uni-th>&ndash;&gt;-->
-<!--&lt;!&ndash;                <uni-th align="center">维修项目</uni-th>&ndash;&gt;-->
-<!--&lt;!&ndash;                <uni-th width="30" align="center" >-</uni-th>&ndash;&gt;-->
-<!--&lt;!&ndash;                <uni-th width="30" align="center" >○</uni-th>&ndash;&gt;-->
-<!--&lt;!&ndash;                <uni-th width="30" align="center" >√</uni-th>&ndash;&gt;-->
-<!--&lt;!&ndash;              </uni-tr>&ndash;&gt;-->
-<!--&lt;!&ndash;              <uni-tr v-for="(item, index) in tableData" :key="index">&ndash;&gt;-->
-<!--&lt;!&ndash;                <uni-td align="center">{{ index+1 }}</uni-td>&ndash;&gt;-->
-<!--&lt;!&ndash;                <uni-td>{{ item.itemName }}</uni-td>&ndash;&gt;-->
-<!--&lt;!&ndash;                <uni-td align="center"><text v-if="item.itemStatus=='01'">-</text></uni-td>&ndash;&gt;-->
-<!--&lt;!&ndash;                <uni-td align="center"><text v-if="item.itemStatus=='02'" style="color: #E8A321">○</text></uni-td>&ndash;&gt;-->
-<!--&lt;!&ndash;                <uni-td align="center"><text v-if="item.itemStatus=='03'" style="color: #17DBB1;">√</text></uni-td>&ndash;&gt;-->
-<!--&lt;!&ndash;              </uni-tr>&ndash;&gt;-->
-<!--&lt;!&ndash;            </uni-table>&ndash;&gt;-->
-<!--          </view>-->
-<!--        </view>-->
         <view v-if="isDetail == '1'" class="card cardInfo projCard">
           <view class="projTitle">维修记录</view>
           <view class="projList">
@@ -399,7 +315,6 @@
               <view v-for="item in ticketInfo.records" :key="item.id" class="projItem">
                 <view class="projTop">
                   <text class="projName">{{ item.type }}【{{item.roleName}}-{{item.dealUserName}}】</text>
-                  <!--                  <text class="projAmount">${{ item.amount }}</text>-->
                 </view>
                 <view class="projBody">
                   <view class="projDate" style="padding: 10rpx 0 0 0" v-if="item.projectName">
@@ -413,16 +328,11 @@
                     <view class="projDesc">
                       {{ item.remark }}
                     </view>
-                    <view class="projImg">
+                    <view class="projImg" v-if="item.itemList && item.itemList.length>0">
                       <image v-for="(img, imgIndex) in item.itemList" @click="prviewImage(item.itemList,imgIndex)" :key="imgIndex" :src="imgUrlPrex + img.image"
                              class="projImgItem"></image>
                     </view>
                     <view class="projSend" v-if="item.itemList.length>0 && canOpenCus">
-<!--                      <template >-->
-<!--                        <image mode="aspectFit" src="/static/icons/sendSuccess.png"-->
-<!--                               style="width: 28rpx;height: 28rpx"></image>-->
-<!--                        <text style="color: #858BA0">已发送客户</text>-->
-<!--                      </template>-->
                       <template >
                           <image mode="aspectFit" src="/static/icons/send.png" style="width: 28rpx;height: 28rpx"></image>
                           <text style="color: #0174F6" @click="sendCusImgManage(item.itemList)">发送给客户</text>
@@ -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 = "已作废"