Merge branch 'spp' into 'master'

Spp

See merge request !15

src/views/tabbar/admin_home.vue

@@ -36,79 +36,90 @@
     </div>
 
     <van-pull-refresh v-model="isloading" @refresh="onRefresh">
-      <van-list
-        v-model="loading"
-        :finished="finished"
-        finished-text="没有更多了~"
-        @load="onmore"
-      >
-      <div class="order-item" v-for="(item, index) in list" :key="index">
-        <div class="title">{{item.order_status_display }}</div>
-        <div class="item flex-h flex-vc">
-          <div class="item-title">预约时间：</div>
-          <div
-            class="item-desc"
-          >{{item.appointment_date}} {{item.appointment_time.start_time}}-{{item.appointment_time.end_time}}</div>
-        </div>
-        <div class="item-title">问题描述：</div>
-        <div class="item-desc que-desc">{{item.repair_type.type_name}}-{{item.description}}</div>
-        <div class="item flex-h flex-start">
-          <div class="item-title">服务地址：</div>
-          <div
-            class="item-desc"
-          >{{item.region.region_name}}-{{item.room.room_name}}-{{item.address}}</div>
-        </div>
-        <div class="item flex-h flex-vc">
-          <div class="item-title">客户姓名：</div>
-          <div class="item-desc">{{item.realname}}</div>
-        </div>
-        <!--<a :href="'tel' + item.telephone">{{item.telephone}}</a>  -->
-        <div class="item flex-h flex-vc">
-          <div class="item-title">联系电话：</div>
-          <div class="item-desc phone" @click="callPhone(item)">{{item.telephone}}</div>
-        </div>
-        <div class="item flex-h flex-vc">
-          <div class="item-title">提交时间：</div>
-          <div class="item-desc">{{item.created_at}}</div>
-        </div>
-        <div class="item flex-h flex-start">
-          <div class="item-title">图片详情：</div>
-          <div @click="preview(item.image,index)" class="img flex-h" v-for="(child, index) in item.image" :key="index">
-            <img :src="child.url" alt />
+      <van-list v-model="loading" :finished="finished" finished-text="没有更多了~" @load="onmore">
+        <div class="order-item" v-for="(item, index) in list" :key="index">
+          <div class="title">{{item.order_status_display }}</div>
+          <div class="item flex-h flex-vc">
+            <div class="item-title">预约时间：</div>
+            <div
+              class="item-desc"
+            >{{item.appointment_date}} {{item.appointment_time.start_time}}-{{item.appointment_time.end_time}}</div>
           </div>
-        </div>
-
-        <div v-if="item.is_can_assign_worker==1">
-          <div class="line"></div>
-          <div
-            v-if="item.is_can_assign_worker==1"
-            class="item flex-h flex-vc flex-hb"
-            @click="workers"
-          >
-            <div class="flex-h flex-vc">
+          <div class="item-title">问题描述：</div>
+          <div class="item-desc que-desc">{{item.repair_type.type_name}}-{{item.description}}</div>
+          <div class="item flex-h flex-start">
+            <div class="item-title">服务地址：</div>
+            <div
+              class="item-desc"
+            >{{item.region.region_name}}-{{item.room.room_name}}-{{item.address}}</div>
+          </div>
+          <div class="item flex-h flex-vc">
+            <div class="item-title">客户姓名：</div>
+            <div class="item-desc">{{item.realname}}</div>
+          </div>
+          <!--<a :href="'tel' + item.telephone">{{item.telephone}}</a>  -->
+          <div class="item flex-h flex-vc">
+            <div class="item-title">联系电话：</div>
+            <div class="item-desc phone" @click="callPhone(item)">{{item.telephone}}</div>
+          </div>
+          <div class="item flex-h flex-vc">
+            <div class="item-title">提交时间：</div>
+            <div class="item-desc">{{item.created_at}}</div>
+          </div>
+          <div class="item flex-h flex-start">
+            <div class="item-title">图片详情：</div>
+            <div
+              @click="preview(item.image,index)"
+              class="img flex-h"
+              v-for="(child, index) in item.image"
+              :key="index"
+            >
+              <img :src="child.url" alt />
+            </div>
+          </div>
+          <div v-if="item.worker">
+            <div class="line"></div>
+            <div class="item flex-h flex-vc">
               <div class="item-title">派工对象：</div>
-              <div class="item-desc">{{workerName}}</div>
+              <div class="item-desc">{{item.worker.name}}</div>
             </div>
-            <div class="flex-h flex-vc">
-              <div class="select flex-h flex-vc">
-                <div class="select_txt">选择</div>
-                <img src="@assets/images/my/select.png" alt />
-              </div>
+            <div class="item flex-h flex-vc">
+              <div class="item-title">联系电话：</div>
+              <div class="item-desc">{{item.worker.phone}}</div>
             </div>
           </div>
-          <div class="line"></div>
-          <div class="allBtn flex-h flex-hr">
+
+          <div v-if="item.is_can_assign_worker==1">
+            <div class="line"></div>
             <div
               v-if="item.is_can_assign_worker==1"
-              class="button sureBtn"
-              @click="sureOrder(item,index)"
-            >确定</div>
-            <div v-if="item.is_can_cancel==1" class="button" @click="cancelOrder(item)">取消</div>
+              class="item flex-h flex-vc flex-hb"
+              @click="workers"
+            >
+              <div class="flex-h flex-vc">
+                <div class="item-title">派工对象：</div>
+                <div class="item-desc">{{workerName}}</div>
+              </div>
+              <div class="flex-h flex-vc">
+                <div class="select flex-h flex-vc">
+                  <div class="select_txt">选择</div>
+                  <img src="@assets/images/my/select.png" alt />
+                </div>
+              </div>
+            </div>
+            <div class="line"></div>
+            <div class="allBtn flex-h flex-hr">
+              <div
+                v-if="item.is_can_assign_worker==1"
+                class="button sureBtn"
+                @click="sureOrder(item,index)"
+              >确定</div>
+              <div v-if="item.is_can_cancel==1" class="button" @click="cancelOrder(item)">取消</div>
+            </div>
           </div>
         </div>
-      </div>
-      <!-- 空数据 -->
-      <van-empty class="custom-image" description="暂无工单哦~" v-if="!list.length && !more" />
+        <!-- 空数据 -->
+        <van-empty class="custom-image" description="暂无工单哦~" v-if="!list.length && !more" />
       </van-list>
     </van-pull-refresh>
     <div class="blank"></div>