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

# Conflicts:
#	components/orderCard.vue

components/orderCard.vue

@@ -42,7 +42,7 @@
         </view>
       </view>
       <view class="footer">
-        <view @click="gotoDetail" v-if="order.ticketsStatus == '04'" class="btn pg">
+        <view @click="projectDis" v-if="order.ticketsStatus == '04'" class="btn pg">
           项目派工
         </view>
         <view @click="gotoDetail" v-else-if="order.ticketsStatus == '06'" class="btn qc">
@@ -87,6 +87,14 @@ export default {
       uni.navigateTo({
         url: '/pages-order/orderDetail/orderDetail?id=' + this.order.id
       })
+    },
+    /**
+     * 项目派工
+     */
+    projectDis(){
+      uni.navigateTo({
+        url: '/pages-order/choosePeople/choosePeople?id=' + this.order.id
+      })
     }
   }
 }

pages-order/choosePeople/choosePeople.vue

@@ -14,7 +14,7 @@
             v-model="checked">
           <view v-for="item in list" :key="item.id" class="userItem">
             <view class="info">
-              <text class="name">{{item.name}}</text>
+              <text class="name">{{item.userName}}</text>
               <text class="trade">{{item.gz}}{{item.checked}}</text>
             </view>
             <u-checkbox v-model="item.checked" :name="item.id" iconSize="24" shape="circle" activeColor="#1890ff"></u-checkbox>
@@ -33,6 +33,7 @@
 <script>
 import VNavigationBar from '@/components/VNavigationBar.vue'
 import {bus} from "@/utils/eventBus";
+import request from '@/utils/request';
 
 export default {
   components: {
@@ -40,17 +41,30 @@ export default {
   },
   data() {
     return {
-      list: [
-        {name: '杨其华', id: 1, gz: '机修'},
-        {name: '钣金', id: 2, gz: '机修'},
-        {name: '周正', id: 3, gz: '喷漆'},
-      ],
+      ticketId:'',
+      list: [],
       checked: []
     }
   },
   onLoad(data) {
+    if(data.id){
+      this.ticketId = data.id
+      this.workByTicketId()
+    }
   },
   methods: {
+    /**
+     * 通过工单id查询维修工人
+     */
+    workByTicketId(){
+      request({
+        url: '/admin-api/repair/worker/listByTicketId',
+        method: 'get',
+        params:{ticketId:this.ticketId}
+      }).then((res)=>{
+        this.list = res.data
+      })
+    },
     submit() {
       console.log('this.checked', this.checked)
       const selected = this.list.filter(f => this.checked.includes(f.id))