Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-repair-app

components/orderCard.vue

@@ -62,11 +62,15 @@
         </view>
         <view @click="projectDis" v-if="order.ticketsStatus == '05' && userInfo.roleCodes.includes('repair_staff') && ifLeader && order.canOperate" class="btn pg">
           <!--维修班组长且当前施工人是本班组内的人，可以重新派工-->
-          重新派工
+          修改派工
         </view>
-        <view @click="projectDis" v-if="order.ticketsStatus == '05' && (userInfo.roleCodes.includes('service_advisor') || userInfo.roleCodes.includes('general_inspection'))" class="btn pg">
+        <view @click="projectDis" v-if="order.ticketsStatus == '05' && userInfo.roleCodes.includes('service_advisor') " class="btn pg">
-          <!--服务顾问和总检，可以重新派工-->
+          <!--修改派工-->
-          重新派工
+          修改派工
+        </view>
+        <view @click="projectDis" v-if="order.ticketsStatus == '05' && userInfo.roleCodes.includes('general_inspection')" class="btn pg">
+          <!--内返派工-->
+          内返派工
         </view>
         <view @click="openFile(order.id)" v-if="order.ticketsStatus == '05' && order.ticketsWorkStatus=='01' && roleCanJd" class="btn qc">
           接单

pages-order/orderDetail/orderDetail.vue

@@ -209,7 +209,7 @@
             <template>
               <view v-for="item in ticketInfo.records" :key="item.id" class="projItem">
                 <view class="projTop">
-                  <text class="projName">{{ item.type }}【{{item.dealUserName}}】</text>
+                  <text class="projName">{{ item.type }}【{{item.roleName}}-{{item.dealUserName}}】</text>
                   <!--                  <text class="projAmount">${{ item.amount }}</text>-->
                 </view>
                 <view class="projBody">
@@ -261,13 +261,13 @@
         </view>
         <view v-else>
           <view class="formItem">
-            <view class="formLabel">姓名</view>
+            <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="formLabel">服务顾问手机号</view>
             <view class="formContainer">
               <input placeholder="请填写联系人联系方式" v-model="callServiceInfo.tel" type="number"/>
             </view>
@@ -276,6 +276,12 @@
         </view>
       </view>
     </uni-popup>
+    <view >
+      <u-modal :show="show" :title="title" confirmText="电话" cancelText="短信" showCancelButton
+               @cancel="message" @confirm="phone " closeOnClickOverlay @close="show = false">
+        客户：{{ ticketInfo.userName }}（{{ ticketInfo.userMobile }}）
+      </u-modal>
+    </view>
   </view>
 </template>
 
@@ -293,6 +299,9 @@ export default {
   },
   data() {
     return {
+      show:false,
+      title:'通知客户',
+      linkContent:'请选择通知客户方式',
       //以下是悬浮操作需要的参数
       direction: 'vertical',
       horizontal: 'right',
@@ -702,9 +711,8 @@ export default {
           url: '/pages-repair/apply/applyForm?ticketId='+this.ticketId
         })
       }else if("callCus"==e.item.code){
-        //服务顾问通知客户取车
+        this.show = true
-        this.ifCallCus = true
+
-        this.$refs.popup.open("bottom")
       }
       // uni.showModal({
       //   title: '提示',
@@ -718,6 +726,20 @@ export default {
       //   }
       // })
     },
+
+    message(){
+      this.show = false
+      // //服务顾问通知客户取车
+      this.ifCallCus = true
+      this.$refs.popup.open("bottom")
+    },
+
+    phone(){
+      uni.makePhoneCall({
+        phoneNumber: this.ticketInfo.userMobile
+      });
+    },
+
     /**
      * 维修照片是否授权给客户看管理
      */