更新

pages/index/Neworder.vue

@@ -32,6 +32,17 @@
           </view>
         </u-upload>
 
+        <view class="box-list"  v-if="driverLicenesImg != undefined">
+
+          <view class="list-box">
+            <view class="l-left">行驶证照片</view>
+            <view class="l-right">
+              <u-album :urls="driverLicenesImg"></u-album>
+            </view>
+          </view>
+
+        </view>
+
         <!-- 名称 -->
 
         <view class="box-list">
@@ -264,6 +275,7 @@ export default {
       buyPhone: '',
       userAddress: '',
       carNum: '',
+      baseImageUrl: this.$baseImageUrl,
       carStatus: '',
       carIdNo: '',
       radioValue: '0',
@@ -312,6 +324,7 @@ export default {
       customerData: [],
       inspectionWorkNodeStr: "",
       leadManId: undefined,
+      driverLicenesImg: undefined,
       meetManId: undefined,
       leadManList: [],
       meetManList: [],
@@ -489,6 +502,9 @@ export default {
       this.carIdNo = res.data.carIdNo
       //skuid
       this.skuId = res.data.skuId
+      //行驶证照片
+      this.driverLicenesImg = res.data.driverLicenesImg == null ? undefined : [this.baseImageUrl + '/' + res.data.driverLicenesImg]
+      console.log('照片', this.driverLicenesImg)
       //goodsId
       this.goodsId = res.data.goodsId
       this.goodstext = this.findItemById(this.columnData, this.skuId).label
@@ -636,6 +652,8 @@ export default {
         startTime: this.recordTime,
         otherPhone: this.otherPhone,
         carRegisterDate: this.carRegisterDate,
+        meetManId: this.meetManId,
+        appointmentId: this.appointmentId,
       }
 
       let res = await request({
@@ -679,6 +697,7 @@ export default {
         leadManId: this.leadManId,
         carRegisterDate: this.carRegisterDate,
         status: '2',
+        meetManId: this.meetManId,
       }
 
       let res = await request({

pages/index/newindex.vue

@@ -157,6 +157,9 @@
           <view class="left_">客户来源</view>
           <view class="right_">自来客户</view>
         </view>
+        <view class="bd">
+          <view class="" style="color:rgb(60, 156, 255);"  @click="previewImage(item.driverLicenesImg)" v-if="item.driverLicenesImg">查看行驶证</view>
+        </view>
       </view>
 
     </view>
@@ -287,6 +290,14 @@ export default {
       })
       this.clearMyInterval()
     },
+    previewImage(imgUrl) {
+      uni.previewImage({
+        urls: [this.baseImageUrl + imgUrl], // 图片数组，可以预览多张
+        current: this.baseImageUrl + imgUrl, // 当前要显示的图片
+        indicator: "default", // 显示指示点
+        loop: true // 是否可循环预览
+      });
+    },
     goAddOrder(data){
       uni.navigateTo({
         url: `/pages/index/Neworder?appointmentId=${data.id}`

pages/index/orderdetails.vue

@@ -61,7 +61,7 @@
             <text>更换引车员</text>
           </view>
         </view>
-        <view class="h-two-box">
+        <view class="h-two-box" v-if="isShowClient">
           <view class="h-two-l">
             <view class="h_title"> 客户信息</view>
             <view class="h_name">{{ detailData.buyUserName }} {{ detailData.buyUserPhone }}</view>
@@ -317,6 +317,7 @@ export default {
       hge: false,
       roleSelect: '',
       orImages: false,
+      isShowClient:true,
       show: false,
       xling: false,
       leadManList: [],
@@ -383,6 +384,9 @@ export default {
         this.roleSelect = res.data
       }
     })
+    if (option.type == 'staff') {
+      this.isShowClient = false
+    }
   },
   onShow() {
   },

pages/order/reservationlist.vue

@@ -21,7 +21,15 @@
 				<view class="a-box" v-for="(item,index) in goodsList" :key="index">
 					<view class="t-box">
 						<view class="s-right">
-							<view class="s-title">{{item.goodsTitle}}</view>
+              <view style="display: flex;justify-content: space-between;">
+                <view class="s-title">{{item.goodsTitle}}</view>
+                <view class="" @click="tel(item.buyPhoneNum)">
+                  <view class="top-anniu">
+                    <uni-icons type="phone-filled" color="#ffffff" size="24"></uni-icons>
+                  </view>
+                </view>
+              </view>
+
 							<view class="dis">
 								<view class="s-hui">预约时间 {{item.appointmentDay}}</view>
 								<view class="s-hui" v-if="item.appointmentPeriod == 0">上午</view>
@@ -30,17 +38,13 @@
 
 								<view class="s-hui">预约人：{{item.buyName}}</view>
 								<view class="s-hui">电话：{{item.buyPhoneNum}}</view>
-								<view class="s-hui">车辆信息：{{item.carBrand || ''}}</view>
+<!--								<view class="s-hui">车辆信息：{{item.carBrand || ''}}</view>-->
-								<view class="s-hui">车辆号码：{{item.carNo || ''}}</view>
+								<view class="s-hui" v-if="item.carNo">车辆号码：{{item.carNo || ''}}</view>
-								<view class="s-hui">车辆性质：{{item.carNature || ''}}</view>
+<!--								<view class="s-hui">车辆性质：{{item.carNature || ''}}</view>-->
 
-
+              <view style="color:#3c9cff;text-align: right;font-size: 30rpx" @click="goAddOrder(item)" v-if="!item.orderId">
-
+                转订单
-						</view>
+              </view>
-						<view class="" @click="tel(item.buyPhoneNum)">
-							<view class="top-anniu">
-								<uni-icons type="phone-filled" color="#ffffff" size="24"></uni-icons>
-							</view>
 
 						</view>
 					</view>
@@ -110,6 +114,11 @@
 					phoneNumber: e //仅为示例
 				});
 			},
+      goAddOrder(data){
+        uni.navigateTo({
+          url: `/pages/index/Neworder?appointmentId=${data.id}`
+        })
+      },
 			async getindex(){
 				// 首页信息
 				let data = {

pages/staff/staff.vue

@@ -53,7 +53,7 @@
                 检测类型：{{ item.skuName }}
               </text>
             </view>
-            <view @click="callUser(item.buyPhone)" class="top-right">
+            <view @click="callUser(item.buyPhone)" class="top-right" v-if="isShowClient">
               <image src="../../static/detection/teel.png" mode=""></image>
             </view>
           </view>
@@ -366,7 +366,7 @@ export default {
     },
     godetails(item) {
       uni.navigateTo({
-        url: "/pages/index/orderdetails?inspectionInfoId=" + item.id + "&workNodeId=" + item.workNodeId + "&workNodeStatus=" + item.workNodeStatus
+        url: `/pages/index/orderdetails?inspectionInfoId=${item.id}&workNodeId=${item.workNodeId}&workNodeStatus=${item.workNodeStatus}&type=staff`
       })
     },
     orderTaking(data) {
@@ -419,6 +419,9 @@ export default {
     tapqh(index) {
       //如果是待接车
       if (this.tapList[index].value == '6') {
+        this.isShowClient = true
+      } else {
+        this.isShowClient = false
       }
       this.tapValue = this.tapList[index].value
       this.tapindex = index