Merge branch 'spp' into 'master'

添加暂无员工

See merge request !40

src/views/my/admin_detail.vue

@@ -130,25 +130,28 @@
             <div class="workers">
               <div class="gr-item" v-for="(child_item,child_index) in columns" :key="child_index">
                 <div class="bm-item">{{child_item.name}}</div>
-                <div
-                  class="people-item flex-h flex-vc flex-hb"
-                  v-for="(lchild_item,lchild_index) in child_item.user"
-                  :key="lchild_index"
-                  @click="chooseWorker(lchild_item,lchild_index)"
-                >
-                  <div class="flex-h flex-vc">
-                    <img class="gr-img" src="@assets/images/gr.png" />
-                    <div
-                      class="gr-name"
-                      v-if="lchild_item.repired_count !== 0 || lchild_item.repiring_count !== 0"
-                    >{{lchild_item.name}} (已派工: {{lchild_item.repired_count}};维修中: {{lchild_item.repiring_count}})</div>
-                    <div class="gr-name" v-else>{{lchild_item.name}} (休息中)</div>
+                <div v-if="child_item.user.length">
+                  <div
+                    class="people-item flex-h flex-vc flex-hb"
+                    v-for="(lchild_item,lchild_index) in child_item.user"
+                    :key="lchild_index"
+                    @click="chooseWorker(lchild_item,lchild_index)"
+                  >
+                    <div class="flex-h flex-vc">
+                      <img class="gr-img" :src="gr_img" />
+                      <div
+                        class="gr-name"
+                        v-if="lchild_item.repired_count !== 0 || lchild_item.repiring_count !== 0"
+                      >{{lchild_item.name}} (已派工: {{lchild_item.repired_count}};维修中: {{lchild_item.repiring_count}})</div>
+                      <div class="gr-name" v-else>{{lchild_item.name}} (休息中)</div>
+                    </div>
+                    <img
+                      class="k-img"
+                      :src="temporaryId && temporaryId.includes(lchild_item.id) ? select_img : unselect_img"
+                    />
                   </div>
-                  <img
-                    class="k-img"
-                    :src="temporaryId && temporaryId.includes(lchild_item.id) ? select_img : unselect_img"
-                  />
                 </div>
+                <div v-else class="none">暂无员工</div>
               </div>
             </div>
             <div class="allBtn btn-box flex-h flex-hc">
@@ -181,6 +184,7 @@ import { trimStrSpace } from '@assets/js/format.js'
 import { ImagePreview, CellGroup } from 'vant';
 import select_img from '@assets/images/select.png'
 import unselect_img from '@assets/images/un_select.png'
+import gr_img from '@assets/images/gr.png'
 export default {
   name: 'admin_detail',
   data () {
@@ -188,6 +192,7 @@ export default {
 			showWorker: false,
             select_img,
             unselect_img,
+            gr_img,
             reson: '',//取消原因
             qxShow: false, // 发起转单弹窗
             workerName: '',
@@ -210,7 +215,7 @@ export default {
 	},
 	created () {
 		this.order_id = this.$route.query.id
-		// this.order_id =  177
+		// this.order_id =  211
 		this.getDetail()
 		this.getWorkers()
 	},

src/views/my/order_detail.vue

@@ -244,8 +244,8 @@ export default {
         }
     },
     created () {
-				// this.order_id = this.$route.query.id
-				this.order_id =  211
+				this.order_id = this.$route.query.id
+				// this.order_id =  211
         this.getDetail()
     },
     methods: {