1

pages-home/home/home.vue

@@ -72,6 +72,7 @@
       </view>
       <!-- 总检角色和维修业务管理员 -->
       <view class="orderCount" v-if="userInfo.roleCodes.includes('general_inspection') || userInfo.roleCodes.includes('weixiu')">
+        <view class="dl-float-view">累计</view>
         <view class="orderCountItem" @click="viewOrder(bossNum.workingIdList)">
           <text class="label">维修中</text>
           <text class="value">{{ bossNum.workingNum }}</text>
@@ -122,6 +123,7 @@
 <!--          </view>-->
 <!--        </view>-->
         <view class="orderCount" >
+          <view class="dl-float-view">当日</view>
           <view class="orderCountItem" @click="viewOrder(bossNum.newOrderIdList)">
             <text class="label">进厂数</text>
             <text class="value">{{ bossNum.newOrderNum }}</text>
@@ -1209,6 +1211,14 @@ export default {
     padding: 15rpx;
     display: flex;
     align-items: center;
+    position: relative;
+    .dl-float-view{
+      position: absolute;
+      left: 5rpx;
+      top: 5rpx;
+      font-size: 12px;
+      color: rgb(232, 163, 33);
+    }
     .orderCountItem {
       flex: 1;
       width: 0;

pages-order/orderDetail/orderDetail.vue

@@ -836,8 +836,8 @@ export default {
               text: '通知取车', active: false,code:"callCus"
             })
           }
-          if("06"==this.ticketInfo.ticketsStatus || "02"==this.ticketInfo.ticketsStatus ){
+          if(("01"==this.ticketInfo.ticketsStatus || "06"==this.ticketInfo.ticketsStatus || "02"==this.ticketInfo.ticketsStatus) && "0"==this.ticketInfo.isHandover){
-            //工单状态是已结算或者挂账，可以交车
+            //工单状态是未结算、已结算或者挂账，交车状态是未交车的，均可以交车
             this.content.push({
               text: '交车', active: false,code:"over"
             })
@@ -1093,7 +1093,7 @@ export default {
         params:{id:this.ticketId,ifApp:true}
       }).then((res)=>{
         let resultObj = res.data
-        resultObj.statusStr = getOrderStatusText(res.data.ticketsStatus)
+        resultObj.statusStr = getOrderStatusText(res.data.ticketsStatus,res.data.isHandover)
         //注册日期
         if (null != resultObj.carInfo.carRegisterDate){
           resultObj.carRegisterDate = formatDate(resultObj.carInfo.carRegisterDate)

pages-repair/apply/applyForm.vue

@@ -178,7 +178,11 @@
           }
         })]
         if(this.ifHouse){
+          //仓管
           dataObj.ifHouseAdd = true
+        }else{
+          //服务顾问
+          dataObj.ifHouseAdd = false
         }
         request({
           url: "/admin-api/repair/twi/addTwi",

pages-warehouse/inOutWarehouse/inOutWarehouse.vue

@@ -53,11 +53,16 @@
     <view class="footer" v-if="isToBeReviewed">
       <text class="label"></text>
       <text class="repairNum"></text>
+      <view class="submit" @click="submitOver">申领完成</view>
       <view class="submit" @click="toPart">采购</view>
       <view class="submit" @click="toInWares">入库单</view>
       <view class="submit" @click="submitBefore">{{ isReceive ? '通知领料' : '通知退料' }}</view>
     </view>
-
+    <!-- 提示窗示例 -->
+    <uni-popup ref="overDialog" type="dialog">
+      <uni-popup-dialog type="success" cancelText="取消" confirmText="确定" title="系统提示" content="确定所有配件均已申领完成？" @confirm="confirmOver"
+                        @close="cancelDialogClose"></uni-popup-dialog>
+    </uni-popup>
     <uni-popup ref="popup" background-color="#fff">
       <view class="popup-content" style="padding: 15px;">
         <view class="dl-avatar-box">
@@ -380,6 +385,43 @@ export default {
       uni.navigateTo({
         url: '/pages-warehouse/inOutWarehouse/part'
       })
+    },
+    /**
+     * 申领完成
+     */
+    submitOver(){
+      this.$refs.overDialog.open()
+    },
+    /**
+     * 确定申领完成
+     */
+    confirmOver(){
+      this.$refs.overDialog.close()
+      request({
+        url: '/admin-api/repair/tw/confirmOver?id='+this.twId,
+        method: 'get'
+      }).then((res) => {
+        if (res.code === 200) {
+          uni.showToast({
+            title: '操作成功！',
+            icon: 'none'
+          })
+          setTimeout(() => {
+            uni.navigateBack()
+          }, 700)
+        }else{
+          uni.showToast({
+            title: '操作失败！',
+            icon: 'none'
+          })
+        }
+      })
+    },
+    /**
+     * 修改已有项目
+     */
+    cancelDialogClose(){
+      this.$refs.overDialog.close()
     }
 
   }

utils/utils.js

@@ -31,9 +31,9 @@ export function getWXStatusHeight() {
 /**
  * 根据订单的状态获取订单的文字展示状态(这个状态范围少，是按李总意思整理出来的状态)
  * @param ticketsStatus 订单状态
- * @param workStatus 维修工作状态
+ * @param isHandover 是否交车
  */
-export function getOrderStatusText(ticketsStatus,workStatus){
+export function getOrderStatusText(ticketsStatus,isHandover){
 	let str = "已进厂";
 	if("04"==ticketsStatus){
 		//待派工
@@ -43,22 +43,40 @@ export function getOrderStatusText(ticketsStatus,workStatus){
 		str = "维修中"
 	}else if("01"==ticketsStatus){
 		//待取车结算
-		str = "已竣工"
+		if("1"==isHandover){
+			//已交车
+			str = "已交车未结算"
+		}else{
+			//未交车
+			str = "未交车未结算"
+		}
 	}else if("06"==ticketsStatus){
 		//挂单/记账
-		str = "已结算"
+		if("1"==isHandover){
+			//已交车
+			str = "已交车已结算"
+		}else{
+			//未交车
+			str = "已结算未交车"
+		}
 	}else if("07"==ticketsStatus){
 		//待通知客户取车
 		str = "已竣工"
-	}else if("08"==ticketsStatus){
-		//已交车
-		str = "已交车"
 	}else if("02"==ticketsStatus){
 		//已结账
-		str = "已结算"
+		if("1"==isHandover){
+			//已交车
+			str = "已交车已结算"
+		}else{
+			//未交车
+			str = "已结算未交车"
+		}
 	}else if("03"==ticketsStatus){
 		//已作废
 		str = "已作废"
+	}else if("08"==ticketsStatus){
+		//已作废
+		str = "已完成"
 	}
 	return str;
 }
@@ -66,9 +84,9 @@ export function getOrderStatusText(ticketsStatus,workStatus){
 /**
  * 根据订单的状态获取订单的文字展示状态(这个状态多，就是系统初始状态)
  * @param ticketsStatus 订单状态
- * @param workStatus 维修工作状态
+ * @param isHandover 是否交车
  */
-export function getOrderStatusTextAll(ticketsStatus,workStatus){
+export function getOrderStatusTextAll(ticketsStatus,isHandover){
 	let str = "已进厂";
 	if("04"==ticketsStatus){
 		//待派工
@@ -78,22 +96,41 @@ export function getOrderStatusTextAll(ticketsStatus,workStatus){
 		str = "维修中"
 	}else if("01"==ticketsStatus){
 		//待取车结算
-		str = "待取车结算"
+		if("1"==isHandover){
+			//已交车
+			str = "已交车未结算"
+		}else{
+			//未交车
+			str = "未交车未结算"
+		}
 	}else if("06"==ticketsStatus){
 		//挂单/记账
 		str = "已挂单/记账待交车"
+		if("1"==isHandover){
+			//已交车
+			str = "已交车已结算"
+		}else{
+			//未交车
+			str = "已结算未交车"
+		}
 	}else if("07"==ticketsStatus){
 		//待通知客户取车
 		str = "待通知客户取车"
-	}else if("08"==ticketsStatus){
-		//已交车
-		str = "已交车"
 	}else if("02"==ticketsStatus){
 		//已结账
-		str = "已结账待交车"
+		if("1"==isHandover){
+			//已交车
+			str = "已交车已结算"
+		}else{
+			//未交车
+			str = "已结算未交车"
+		}
 	}else if("03"==ticketsStatus){
 		//已作废
 		str = "已作废"
+	}else if("08"==ticketsStatus){
+		//已作废
+		str = "已完成"
 	}
 	return str;
 }
@@ -253,7 +290,7 @@ export function builderOrder(order) {
 		flag: 1,
 		ticketsStatus: order.ticketsStatus,
 		ticketsWorkStatus: order.ticketsWorkStatus,
-		flagStr: getOrderStatusTextAll(order.ticketsStatus, order.ticketsWorkStatus),
+		flagStr: getOrderStatusTextAll(order.ticketsStatus, order.isHandover),
 		carNum: order.carNo,
 		nowRepairId: order.nowRepairId,
 		carModel: order.carBrandName,