工单详情，‘生成司机信息’问题修复

public/index.html

@@ -31,14 +31,14 @@
         }
     </script>
     <script type="text/javascript" src="https://webapi.amap.com/maps?v=2.0&key=2560bbf04daef66c810c5e6a97e8c508&plugin=AMap.AutoComplete,AMap.PlaceSearch,AMap.Geolocation,AMap.Geocoder,AMap.Marker,AMap.Driving"></script>
-<!--    <script src="https://unpkg.com/vconsole@latest/dist/vconsole.min.js"></script>-->
+    <script src="https://unpkg.com/vconsole@latest/dist/vconsole.min.js"></script>
     <script>
         window.selfLink = window.location.href;
         window.selfSearch = window.location.search;
     </script>
     <script>
         // VConsole 默认会挂载到 `window.VConsole` 上
-        // let vConsole = new window.VConsole();
+        let vConsole = new window.VConsole();
         (function (doc, win) {
             // console.log("==window.location.pathname===",window.location.pathname)
             let docEl = doc.documentElement

src/api/order.js

@@ -23,7 +23,7 @@ export function toDoAudit(data){
     data
   })
 }
-// 工单详情
+//
 export function getOrderDetail(data){
   return request({
     url:'/supplierAppV2/dispatchApp/order/getOrderDetail',

src/views/index/workOrderDetail.vue

@@ -1,41 +1,57 @@
 <template>
   <div class="wrap">
-    <div class="baseInfo common" :style="{'height':orderDetailInfo.contractParentId == 110 ? '300px' : '240px'}">
+    <div class="baseInfo common">
       <div class="title">基本信息:</div>
       <div class="line"></div>
       <div class="infoWrap fontColor">
-        <div class="leftTitle">
+        <div class="infoRow">
-          <div class="leftItem">工单编号:</div>
+          <span class="leftItem">工单编号:</span>
-          <div class="leftItem" v-if="!([7,9,11,12].includes(Number(queryType)))">合同:</div>
+          <span class="rightItem" style="display: flex;align-items: center;">
-          <template v-if="orderDetailInfo.contractParentId == 110">
-            <div class="leftItem">机构名称:</div>
-            <div class="leftItem">销售人员:</div>
-            <div class="leftItem">司机号码:</div>
-          </template>
-          <div class="leftItem">结算方式:</div>
-          <div class="leftItem">客户姓名:</div>
-          <div class="leftItem">客户电话:</div>
-          <div class="leftItem">车牌号:</div>
-          <div class="leftItem">车型品牌:</div>
-        </div>
-        <div class="rightContent">
-          <div class="rightItem" style="display: flex;align-items: center;">
             <span id="copyText">{{orderDetailInfo.orderCode}}</span>
             <img @click="copyText" src="@/assets/copy.png" style="width: 35px;height: 15px;margin-left: 10px"/>
+          </span>
+        </div>
+        <div class="infoRow" v-if="!([7,9,11,12].includes(Number(queryType)))">
+          <span class="leftItem">合同:</span>
+          <span class="rightItem">{{ orderDetailInfo.contractName }}</span>
         </div>
-          <div class="rightItem" v-if="!([7,9,11,12].includes(Number(queryType)))">{{ orderDetailInfo.contractName }}</div>
         <template v-if="orderDetailInfo.contractParentId == 110">
-            <div class="rightItem">{{ orderDetailInfo.organizeName }}</div>
+          <div class="infoRow">
-            <div class="rightItem">{{ orderDetailInfo.saleName }}</div>
+            <span class="leftItem">机构名称:</span>
-            <div class="rightItem">{{ orderDetailInfo.driverPhone ? orderDetailInfo.driverPhone : '  '}}</div>
+            <span class="rightItem">{{ orderDetailInfo.organizeName }}</span>
+          </div>
+          <div class="infoRow">
+            <span class="leftItem">销售人员:</span>
+            <span class="rightItem">{{ orderDetailInfo.saleName }}</span>
+          </div>
+          <div class="infoRow">
+            <span class="leftItem">司机号码:</span>
+            <span class="rightItem">{{ orderDetailInfo.driverPhone ? orderDetailInfo.driverPhone : '  '}}</span>
+          </div>
         </template>
-          <div class="rightItem">{{ orderDetailInfo.contractSettleType?.label }}</div>
+        <div class="infoRow">
-          <div class="rightItem">{{  [7,9,11,12].includes(Number(queryType)) ? maskName(orderDetailInfo.userName) : orderDetailInfo.userName }}</div>
+          <span class="leftItem">结算方式:</span>
-          <div class="rightItem">{{ maskPhone(orderDetailInfo.userPhone) }}</div>
+          <span class="rightItem">{{ orderDetailInfo.contractSettleType?.label }}</span>
-          <div class="rightItem">{{ [7,9,11,12].includes(Number(queryType)) ? maskPlate(orderDetailInfo.plateNumber) : orderDetailInfo.plateNumber }}</div>
+        </div>
-<!--          <div class="rightItem" >理想智动LXA6500SHEVM理想智动LXA6500SHEVM</div>-->
+        <div class="infoRow">
-          <div class="rightItem" >{{orderDetailInfo.model}}{{ orderDetailInfo.brand }}</div>
+          <span class="leftItem">客户姓名:</span>
-
+          <span class="rightItem">{{ [7,9,11,12].includes(Number(queryType)) ? maskName(orderDetailInfo.userName) : orderDetailInfo.userName }}</span>
+        </div>
+        <div class="infoRow">
+          <span class="leftItem">客户电话:</span>
+          <span class="rightItem">{{ maskPhone(orderDetailInfo.userPhone) }}</span>
+        </div>
+        <div class="infoRow">
+          <span class="leftItem">车牌号:</span>
+          <span class="rightItem">{{ [7,9,11,12].includes(Number(queryType)) ? maskPlate(orderDetailInfo.plateNumber) : orderDetailInfo.plateNumber }}</span>
+        </div>
+        <div class="infoRow">
+          <span class="leftItem">车型品牌:</span>
+          <span class="rightItem">{{orderDetailInfo.model}}{{ orderDetailInfo.brand }}</span>
+        </div>
+        <div class="infoRow" v-if="!([7,9,11,12].includes(Number(queryType)))">
+          <span class="leftItem">车架号:</span>
+          <span class="rightItem">{{orderDetailInfo.vinNo}}</span>
         </div>
       </div>
     </div>
@@ -168,19 +184,15 @@ export default {
       })
       if(result.data){
         // console.log('--result--',result.data)
-        let params={
+        let params=`姓名：${this.orderDetailInfo.driverName}\n身份证：${result.data.identityCardNumber}\n车牌：${this.orderDetailInfo.vehiclePlateNumber}\n手机：${this.orderDetailInfo.driverPhone}`
-          '姓名：':this.orderDetailInfo.driverName,
+        // console.log('params',params)
-          '身份证：':result.data.identityCardNumber,
+        let data = {"action":"copyToClipboard","params":params}
-          '车牌：':this.orderDetailInfo.plateNumber,
-          '手机:':this.orderDetailInfo.driverPhone,
-        }
-        let data = {"action":"copyToClipboard","params":JSON.stringify(params)}
         var u = navigator.userAgent;
         var isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/);
         if(isiOS){
           window.webkit.messageHandlers.nativeObject.postMessage(data);
         }else {
-          window.android.copyToClipboard(JSON.stringify(params));
+          window.android.copyToClipboard(params);
         }
       }else {
         this.$toast('未获取到司机信息')
@@ -337,21 +349,25 @@ export default {
 }
 .baseInfo{
   width: 100%;
-  //@include wh(100%,260px);
   margin-bottom: 12px;
   .infoWrap{
+    .infoRow{
       display: flex;
-    .leftTitle{
+      align-items: center;
+      min-height: 24px;
+      .leftItem{
+        width: 60px;
+        flex-shrink: 0;
         margin-left: 5px;
         margin-right: 6px;
-      @include wh(60px,189px);
         opacity: .5;
       }
-    .rightContent{
-      height: 189px;
-      width: calc(100% - 60px);
       .rightItem{
-        height: 24px;
+        flex: 1;
+        min-width: 0;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
       }
     }
   }