Skip to content

R
repair_workers_h5
Commit 5b7b7161 authored by 郭欢's avatar 郭欢
Browse files
Options

'修改，'

parents 0e13bace ca7a15af
Show whitespace changes
Inline Side-by-side
Showing with 100 additions and 158 deletions
src/views/my/admin_detail.vue
View file @ 5b7b7161
......@@ -3,27 +3,25 @@
<van-pull-refresh v-model="isloading" @refresh="onRefresh">
<div class="order-item">
<div class="item flex-h flex-vc">
<div class="title">{{ order.order_status_display }}</div>
<div class="title">{{order.order_status_display}}</div>
</div>
<div class="item-title">问题描述：</div>
<div
class="item-desc que-desc"
>{{ order.repair_type.type_name }}-{{ order.description }}</div>
>{{order.repair_type.type_name}}-{{order.description}}</div>
<div class="item flex-h flex-vc">
<div class="item-title">服务地址：</div>
<div class="item-desc">
{{ order.region.region_name }}-{{
order.room.room_name
}}-{{ order.address }}
</div>
<div
class="item-desc"
>{{order.region.region_name}}-{{order.room.room_name}}-{{order.address}}</div>
</div>
<div class="item flex-h flex-vc">
<div class="item-title">客户姓名：</div>
<div class="item-desc">{{ order.realname }}</div>
<div class="item-desc">{{order.realname}}</div>
</div>
<div class="item flex-h flex-vc">
<div class="item-title">联系电话：</div>
<div class="item-desc phone" @click="callPhone(order)">{{ order.telephone }}</div>
<div class="item-desc phone" @click="callPhone(order)">{{order.telephone}}</div>
</div>
<div class="item flex-h flex-vc">
<div class="item-title">提交时间：</div>
......@@ -35,7 +33,7 @@
class="img"
v-for="(child, index) in order.image"
:key="index"
@click="preview(order.image, index)"
@click="preview(order.image,index)"
>
<img :src="child.url" alt />
</div>
......@@ -44,7 +42,7 @@
<div class="line"></div>
<div class="item flex-h flex-vc">
<div class="item-title">派工对象：</div>
<div class="item-desc">{{ order.work_name }}</div>
<div class="item-desc">{{order.work_name}}</div>
</div>
</div>
<div class="material" v-if="order.no_pay_order">
......@@ -54,12 +52,12 @@
v-for="(child, index) in order.no_pay_order.goods"
:key="index"
>
<div class="one one1 text-line-one">{{ child.parent_detail.goods_name }}</div>
<div class="one one1 text-line-one">{{child.parent_detail.goods_name}}</div>
<div class="one one2 flex-h">
<div class="_one text-line-one">{{ child.good_detail.goods_name }}</div>
<div class="_two text-line-one">*{{ child.number }}</div>
<div class="_one text-line-one">{{child.good_detail.goods_name}}</div>
<div class="_two text-line-one">*{{child.number}}</div>
</div>
<div class="one one3">￥{{ child.price }}</div>
<div class="one one3">￥{{child.price}}</div>
</div>
<div class="item_line"></div>
</div>
......@@ -71,12 +69,12 @@
v-for="(child, index) in parent.goods"
:key="index"
>
<div class="one one1 text-line-one">{{ child.parent_detail.goods_name }}</div>
<div class="one one1 text-line-one">{{child.parent_detail.goods_name}}</div>
<div class="one one2 flex-h">
<div class="_one text-line-one">{{ child.good_detail.goods_name }}</div>
<div class="_two text-line-one">*{{ child.number }}</div>
<div class="_one text-line-one">{{child.good_detail.goods_name}}</div>
<div class="_two text-line-one">*{{child.number}}</div>
</div>
<div class="one one3">￥{{ child.price }}</div>
<div class="one one3">￥{{child.price}}</div>
</div>
</div>
<div class="item_line"></div>
......@@ -85,17 +83,16 @@
<div class="item-title bz-title">备注耗材</div>
<div
class="ma-item flex-h flex-hb"
v-for="(child, index) in order.free_material_order
.goods"
v-for="(child, index) in order.free_material_order.goods"
:key="index"
>
<div class="one one1 text-line-one">免费</div>
<div class="one one2 flex-h">
<div
class="_one text-line-one"
@click="showAll(item, $event)"
>{{ child.goods_name }}</div>
<div class="_two text-line-one">*{{ child.number }}</div>
@click="showAll(item,$event)"
>{{child.goods_name}}</div>
<div class="_two text-line-one">*{{child.number}}</div>
</div>
<div class="one one3 text-line-one">￥0</div>
</div>
......@@ -103,29 +100,25 @@
</div>
<div class="item flex-h flex-start" v-if="order.orderlog_transfer">
<div class="item-title">转单备注:</div>
<div class="item-desc">{{ order.orderlog_transfer.remark }}</div>
<div class="item-desc">{{order.orderlog_transfer.remark}}</div>
</div>
<div class="item flex-h flex-start" v-if="order.orderlog_cancel">
<div class="item-title">退回备注:</div>
<div class="item-desc">{{ order.orderlog_cancel.remark }}</div>
<div class="item-desc">{{order.orderlog_cancel.remark}}</div>
</div>
<div v-if="order.is_can_assign_worker == 1">
<div v-if="order.is_can_assign_worker==1">
<div class="line"></div>
<div
v-if="order.is_can_assign_worker == 1"
v-if="order.is_can_assign_worker==1"
class="item flex-h flex-vc flex-hb"
@click="workers"
>
<div class="wo flex-h flex-vc">
<div class="item-title" v-if="order.order_status_display == '已派工'">重新派工：</div>
<div class="item-title" v-else>派工对象：</div>
<div class="item-desc worker-name">
{{
workerName.length
? workerName.join(',')
: ''
}}
</div>
<div
class="item-desc worker-name"
>{{workerName.length ? workerName.join(',') : ''}}</div>
</div>
<div class="flex-h flex-vc">
<div class="select flex-h flex-vc">
......@@ -138,11 +131,11 @@
<div class="line"></div>
<div class="allBtn flex-h flex-hr">
<div
v-if="order.is_can_assign_worker == 1"
v-if="order.is_can_assign_worker==1"
class="button sureBtn"
@click="sureOrder"
>确定</div>
<div v-if="order.is_can_cancel == 1" class="button" @click="cancelOrder">取消</div>
<div v-if="order.is_can_cancel==1" class="button" @click="cancelOrder">取消</div>
</div>
<!-- 选择工人弹窗 -->
......@@ -152,16 +145,14 @@
<div class="workers">
<div
class="gr-item"
v-for="(child_item, child_index) in columns"
v-for="(child_item,child_index) in columns"
:key="child_index"
>
<div class="bm-item">{{ child_item.name }}</div>
<div class="bm-item">{{child_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"
v-for="(lchild_item,lchild_index) in child_item.user"
:key="lchild_index"
@click="chooseWorker(lchild_item,lchild_index)"
>
......@@ -169,21 +160,13 @@
<img class="gr-img" :src="grImg" />
<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>
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) ? selectImg: unselectImg"
:src="temporaryId && temporaryId.includes(lchild_item.id) ? selectImg : unselectImg"
/>
</div>
</div>
......@@ -200,7 +183,7 @@
<van-popup v-model="qxShow" close-icon="close">
<div class="cancel_cont">
<div class="pop_title">备注取消原因</div>
<textarea placeholder="请输入转单理由" v-model="reason" maxlength="100"></textarea>
<textarea placeholder="请输入取消原因" v-model="reason" maxlength="100"></textarea>
<div class="btnItem flex-h">
<div class="cancel" @click="cancel">取消</div>
<div class="sure" @click="qx_submit">提交</div>
......@@ -248,11 +231,6 @@ export default {
temporaryId: ''
}
},
// created () {
// this.order_id = this.$route.query.id
// this.getDetail()
// this.getWorkers()
// },
methods: {
goBack () {
this.$router.push({
......@@ -405,10 +383,8 @@ export default {
cancel () {
this.qxShow = false
},
fetchData (to, from) {
this.order_id = to.query ? to.query.id : ''
console.log(to, 'to-----------11111111111111111111111111111')
if (this.order_id) {
this.getDetail()
this.getWorkers()
......
src/views/tabbar/admin_home.vue
View file @ 5b7b7161
<template>
<div class="cont">
<div class="menu flex-h flex-hb flex-vc">
<div class="hc_total">共{{ count }}个工单</div>
<div class="hc_total">共{{count}}个工单</div>
<div class="flex-h flex-hb">
<div class="options">
<div @click="chooseStatus">{{ curSelectStatus.name }}</div>
<div @click="chooseStatus">{{curSelectStatus.name}}</div>
<div class="option-box" v-show="statusShow">
<div
class="option-item"
......@@ -12,11 +12,11 @@
:key="item.statustype"
:value="item.name"
@click="changeStatus(item)"
>{{ item.name }}</div>
>{{item.name}}</div>
</div>
</div>
<div class="options">
<div @click="chooseTab">{{ curSelect.name }}</div>
<div @click="chooseTab">{{curSelect.name}}</div>
<div class="option-box" v-show="tabShow">
<div
class="option-item"
......@@ -24,15 +24,15 @@
:key="item.type"
:value="item.name"
@click="changeItem(item)"
>{{ item.name }}</div>
>{{item.name}}</div>
</div>
</div>
</div>
</div>
<div class="date flex-h flex-hb flex-vc" v-if="this.curSelect.type == 4">
<div class="start" @click="stShow">{{ startTime }}</div>
<div class="date flex-h flex-hb flex-vc" v-if="this.curSelect.type==4">
<div class="start" @click="stShow">{{startTime}}</div>
<div class="blue"></div>
<div class="end" @click="endShow">{{ endTime }}</div>
<div class="end" @click="endShow">{{endTime}}</div>
</div>
<van-pull-refresh v-model="isloading" @refresh="onRefresh">
......@@ -58,60 +58,31 @@
<div class="workers">
<div
class="gr-item"
v-for="(child_item, child_index) in columns"
v-for="(child_item,child_index) in columns"
:key="child_index"
>
<div class="bm-item">{{ child_item.name }}</div>
<div class="bm-item">{{child_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"
v-for="(lchild_item,lchild_index) in child_item.user"
:key="lchild_index"
@click="
chooseWorker(
lchild_item,
lchild_index,
index
)
"
@click="chooseWorker(lchild_item,lchild_index,index)"
>
<div class="flex-h flex-vc">
<img class="gr-img" :src="grImg" />
<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>
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="
item.temporaryId &&
item.temporaryId.includes(
lchild_item.id
)
? selectImg
: unselectImg
"
:src="item.temporaryId && item.temporaryId.includes(lchild_item.id) ? selectImg : unselectImg"
/>
</div>
</div>
......@@ -124,45 +95,40 @@
</div>
</div>
</van-popup>
<div class="title">{{ item.order_status_display }}</div>
<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
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>
>{{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
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 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 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 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, child_i)"
@click="preview(item.image,child_i)"
class="img flex-h"
v-for="(child, child_i) in item.image"
:key="child_i"
......@@ -177,12 +143,12 @@
v-for="(child, index) in item.no_pay_order.goods"
:key="index"
>
<div class="one one1 text-line-one">{{ child.parent_detail.goods_name }}</div>
<div class="one one1 text-line-one">{{child.parent_detail.goods_name}}</div>
<div class="one one2 flex-h">
<div class="_one text-line-one">{{ child.good_detail.goods_name }}</div>
<div class="_two text-line-one">*{{ child.number }}</div>
<div class="_one text-line-one">{{child.good_detail.goods_name}}</div>
<div class="_two text-line-one">*{{child.number}}</div>
</div>
<div class="one one3">￥{{ child.price }}</div>
<div class="one one3">￥{{child.price}}</div>
</div>
<div class="item_line"></div>
</div>
......@@ -196,15 +162,13 @@
>
<div
class="one one1 text-line-one"
>{{ child.parent_detail.goods_name }}</div>
>{{child.parent_detail.goods_name}}</div>
<!-- <div class="one">{{child.good_detail.goods_name}}*{{child.number}}</div> -->
<div class="one one2 flex-h">
<div
class="_one text-line-one"
>{{ child.good_detail.goods_name }}</div>
<div class="_two text-line-one">*{{ child.number }}</div>
<div class="_one text-line-one">{{child.good_detail.goods_name}}</div>
<div class="_two text-line-one">*{{child.number}}</div>
</div>
<div class="one one3">￥{{ child.price }}</div>
<div class="one one3">￥{{child.price}}</div>
</div>
</div>
<div class="item_line"></div>
......@@ -214,17 +178,16 @@
<div class="item-title bz-title">备注耗材</div>
<div
class="ma-item flex-h flex-hb"
v-for="(child, index) in item.free_material_order
.goods"
v-for="(child, index) in item.free_material_order.goods"
:key="index"
>
<div class="one one1 text-line-one">免费</div>
<div class="one one2 flex-h">
<div
class="_one text-line-one"
@click="showAll(item, $event)"
>{{ child.goods_name }}</div>
<div class="_two text-line-one">*{{ child.number }}</div>
@click="showAll(item,$event)"
>{{child.goods_name}}</div>
<div class="_two text-line-one">*{{child.number}}</div>
</div>
<!-- <div class="one one2 text-line-one">{{child.goods_name}}*{{child.number}}</div> -->
<div class="one one3 text-line-one">￥0</div>
......@@ -233,11 +196,11 @@
</div>
<div class="item flex-h flex-start" v-if="item.orderlog_transfer">
<div class="item-title">转单备注:</div>
<div class="item-desc">{{ item.orderlog_transfer.remark }}</div>
<div class="item-desc">{{item.orderlog_transfer.remark}}</div>
</div>
<div class="item flex-h flex-start" v-if="item.orderlog_cancel">
<div class="item-title">退回备注:</div>
<div class="item-desc">{{ item.orderlog_cancel.remark }}</div>
<div class="item-desc">{{item.orderlog_cancel.remark}}</div>
</div>
<!-- <div v-if="item.worker">
<div class="line"></div>
......@@ -254,14 +217,14 @@
<div class="line"></div>
<div class="item flex-h flex-vc">
<div class="item-title">派工对象：</div>
<div class="item-desc">{{ item.work_name }}</div>
<div class="item-desc">{{item.work_name}}</div>
</div>
</div>
<div v-if="item.is_can_assign_worker == 1">
<div v-if="item.is_can_assign_worker==1">
<div class="line"></div>
<div
v-if="item.is_can_assign_worker == 1"
v-if="item.is_can_assign_worker==1"
class="item flex-h flex-vc flex-hb"
@click="workers(index)"
>
......@@ -271,7 +234,7 @@
v-if="item.order_status_display == '已派工'"
>重新派工：</div>
<div class="item-title" v-else>派工对象：</div>
<div class="item-desc worker-name">{{ item.realName }}</div>
<div class="item-desc worker-name">{{item.realName}}</div>
</div>
<div class="flex-h flex-vc">
<div class="select flex-h flex-vc">
......@@ -283,12 +246,12 @@
<div class="line"></div>
<div class="allBtn flex-h flex-hr">
<div
v-if="item.is_can_assign_worker == 1"
v-if="item.is_can_assign_worker==1"
class="button sureBtn"
@click="sureOrder(item, index)"
@click="sureOrder(item,index)"
>确定</div>
<div
v-if="item.is_can_cancel == 1"
v-if="item.is_can_cancel==1"
class="button"
@click="cancelOrder(item)"
>取消</div>
......@@ -304,7 +267,7 @@
<van-popup v-model="qxShow" close-icon="close">
<div class="cancel_cont">
<div class="pop_title">备注取消原因</div>
<textarea placeholder="请输入转单理由" v-model="reason" maxlength="100"></textarea>
<textarea placeholder="请输入取消原因" v-model="reason" maxlength="100"></textarea>
<div class="btnItem flex-h">
<div class="cancel" @click="cancel">取消</div>
<div class="sure" @click="qx_submit">提交</div>
......@@ -342,6 +305,7 @@
</template>
<script>
// import myTabbar from '@components/common/tabbar.vue'
// import { trimStrSpace } from '@assets/js/format.js'
import { ImagePreview } from 'vant'
import selectImg from '@assets/images/select.png'
......@@ -349,6 +313,9 @@ import unselectImg from '@assets/images/un_select.png'
import grImg from '@assets/images/gr.png'
export default {
name: 'home',
components: {
// myTabbar
},
data () {
return {
selectImg,
......@@ -414,10 +381,6 @@ export default {
currentId: ''
}
},
// created () {
// this.getList()
// this.getWorkers()
// },
methods: {
// 选择完工人点击确定按钮
keyConfirm (i) {
......@@ -459,7 +422,7 @@ export default {
},
// 指派工人
sureOrder (item, index) {
const vm = this
// const vm = this
// const index = this.list.findIndex(item => item.id === this.curItem.id)
// console.log('index',index);
// console.log('1111',item);
......@@ -580,6 +543,7 @@ export default {
.get(this.$myApi.GET_WORKER, curParams)
.then((data) => {
this.columns = data
console.log(this.columns, '工人')
// var arr = []
// for (let i in data) {
// let options = {
......@@ -742,8 +706,9 @@ export default {
},
fetchData (to, from) {
this.getList()
this.getUserInfo()
this.getWorkers()
}
},
beforeRouteEnter (to, from, next) {
next(vm => {
......@@ -753,6 +718,7 @@ export default {
beforeRouteLeave (to, from, next) {
next()
}
}
</script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment