1

pages-order/orderDetail/orderDetail.vue

@@ -200,7 +200,7 @@
             <template>
               <view v-for="item in ticketInfo.records" :key="item.id" class="projItem">
                 <view class="projTop">
-                  <text class="projName">{{ item.typeStr }}【{{item.dealUserName}}】</text>
+                  <text class="projName">{{ item.type }}【{{item.dealUserName}}】</text>
                   <!--                  <text class="projAmount">${{ item.amount }}</text>-->
                 </view>
                 <view class="projBody">
@@ -244,10 +244,27 @@
     <!-- 普通弹窗---拍照上传 -->
     <uni-popup ref="popup" background-color="#fff">
       <view class="popup-content">
-        <view class="dl-avatar-box">
+        <view v-if="!ifCallCus">
-          <uni-file-picker :value="fileList" :sizeType="sizeType" @select="afterRead" @delete="deleteFile" limit="9" title="最多选择9张图片"></uni-file-picker>
+          <view class="dl-avatar-box">
+            <uni-file-picker :value="fileList" :sizeType="sizeType" @select="afterRead" @delete="deleteFile" limit="9" title="最多选择9张图片"></uni-file-picker>
+          </view>
+          <button type="primary" @click="saveWorkingItem">保存</button>
+        </view>
+        <view v-else>
+          <view class="formItem">
+            <view class="formLabel">姓名</view>
+            <view class="formContainer">
+              <input placeholder="请填写联系人姓名" v-model="callServiceInfo.name" type="text"/>
+            </view>
+          </view>
+          <view class="formItem">
+            <view class="formLabel">手机号</view>
+            <view class="formContainer">
+              <input placeholder="请填写联系人联系方式" v-model="callServiceInfo.tel" type="number"/>
+            </view>
+          </view>
+          <button type="primary" @click="saveWorkingItem">通知客户取车</button>
         </view>
-        <button type="primary" @click="saveWorkingItem">保存</button>
       </view>
     </uni-popup>
   </view>
@@ -353,7 +370,14 @@ export default {
         //   constructor: []
         // }
       ],
-      submitData:[]
+      submitData:[],
+      //是否是通知客户取车操作，默认都不是
+      ifCallCus:false,
+      //通知客户取车联系人对象
+      callServiceInfo:{
+        name:"",
+        tel:""
+      },
     };
   },
   onLoad(data) {
@@ -451,13 +475,26 @@ export default {
             data:dataObj
           }).then((res) => {
           })
+        }else if("callCus"==this.nowChooseOperate){
+          //服务顾问通知客户取车
+          let dataObj = {
+            id: this.ticketInfo.id,
+            name:this.callServiceInfo.name,
+            mobile:this.callServiceInfo.tel,
+          }
+          request({
+            url: '/admin-api/repair/tickets/noticeCus',
+            method: 'POST',
+            data:dataObj
+          }).then((res) => {
+          })
         }
         this.$refs.popup.close()
         uni.showToast({
           title: '操作成功',
           icon: 'none'
         })
-        if("done"==this.nowChooseOperate || "check"==this.nowChooseOperate){
+        if("done"==this.nowChooseOperate || "check"==this.nowChooseOperate || "callCus"==this.nowChooseOperate){
           //移交总检需要返回| 总检拍照后需要返回
           setTimeout(() => {
             uni.navigateBack()
@@ -483,15 +520,23 @@ export default {
       if(this.loginUser.roleCodes.includes("service_advisor")){
         //服务顾问
         this.canOpenCus = true
-        if(this.ticketInfo.nowRepairId==this.loginUser.id && "05"==this.ticketInfo.ticketsStatus){
+        if(this.ticketInfo.nowRepairId==this.loginUser.id){
           //当前用户就是处理人，可以进行出厂检验  和通知客户取车
-          this.content.push({
+          if("05"==this.ticketInfo.ticketsStatus) {
-            text: '出厂检验', active: false,code:"out"
+            this.content.push({
-          })
+              text: '出厂检验', active: false, code: "out"
-          this.content.push({
+            })
-            text: '通知取车', active: false,code:"callCus"
+          }
-          })
+          if("07"==this.ticketInfo.ticketsStatus){
+            //工单状态是待通知客户取车，才能通知
+            this.content.push({
+              text: '通知取车', active: false,code:"callCus"
+            })
+          }
         }
+        //设置服务顾问默认的姓名联系方式
+        this.callServiceInfo.name = this.loginUser.nickname
+        this.callServiceInfo.tel = this.loginUser.mobile
       }
       if(this.loginUser.roleCodes.includes("weixiu")){
         //维修管理员
@@ -544,6 +589,8 @@ export default {
      * 操作按钮点击事件
      */
     trigger(e) {
+      //默认不是同时客户取车操作
+      this.ifCallCus = false
       console.log(e)
       this.content[e.index].active = !e.item.active
       this.nowChooseOperate = e.item.code
@@ -559,6 +606,10 @@ export default {
         uni.navigateTo({
           url: '/pages-repair/apply/applyForm?ticketId='+this.ticketId
         })
+      }else if("callCus"==e.item.code){
+        //服务顾问通知客户取车
+        this.ifCallCus = true
+        this.$refs.popup.open("bottom")
       }
       // uni.showModal({
       //   title: '提示',
@@ -685,15 +736,9 @@ export default {
         } else {
           resultObj.birthday = '未知'
         }
-        //维修记录匹配数据字典
+        //维修记录格式化时间
         if (null != resultObj.records){
           resultObj.records.map((item)=>{
-            getDictTextByCodeAndValue("repair_records_type",item.type).then(value => {
-              item.typeStr = value
-            }).catch(error => {
-              item.typeStr = "未知"
-              console.error(error);
-            });
             item.createTime = formatTimestamp(item.createTime)
           })
         }
@@ -1225,5 +1270,18 @@ export default {
       color: #FFFFFF;
     }
   }
+
+  .formItem {
+    padding: 40rpx 0;
+    margin: 0 32rpx;
+    border-bottom: 1rpx solid #EEEEEE;
+  }
+
+  .formLabel {
+    font-weight: 500;
+    font-size: 28rpx;
+    color: #333333;
+    padding-bottom: 20rpx;
+  }
 }
 </style>

utils/utils.js

@@ -42,11 +42,14 @@ export function getOrderStatusText(ticketsStatus,workStatus){
 		//维修中
 		str = "维修中"
 	}else if("01"==ticketsStatus){
-		//待结算
+		//待取车结算
-		str = "待结算"
+		str = "待取车结算"
 	}else if("06"==ticketsStatus){
 		//挂单/记账
 		str = "挂单/记账"
+	}else if("07"==ticketsStatus){
+		//待通知客户取车
+		str = "待通知客户取车"
 	}else if("02"==ticketsStatus){
 		//已结账
 		str = "已结账"