Commit 527f11e5 by Jie Feng

fix conflict for merging code

parents 5e424636 2d852f4c
...@@ -64,7 +64,7 @@ jQuery(document).ready(function ($) { ...@@ -64,7 +64,7 @@ jQuery(document).ready(function ($) {
console.log('updateWOStatus:' + val.target.value); console.log('updateWOStatus:' + val.target.value);
var url = "/work/ws/update"; var url = "/work/ws/update";
var data = JSON.stringify({ var data = JSON.stringify({
"woStatus": val.target.value, "userStatus": val.target.value,
"statusDisplay": "", "statusDisplay": "",
"userId": 1 "userId": 1
}); });
......
jQuery(document).ready(function ($) { jQuery(document).ready(function ($) {
var auditTableName = "wo_work_order"
var woType = "revisit"
// 工单列表逻辑 // 工单列表逻辑
var woDetail = new Vue({ var woDetail = new Vue({
el: '#woDetail', el: '#woDetail',
data: { data: {
orderDetail:{
id: 0,
orderNum: 0,
doctorUid: 0,
doctorName: '',
processUid: 0,
processName: '',
phoneNum: '',
customerUid: 0,
customerName: '',
callStatus: 0, callStatus: 0,
callRemark: '', callRemark: '',
smsStatus: 0, smsStatus: 0,
...@@ -12,21 +25,17 @@ jQuery(document).ready(function ($) { ...@@ -12,21 +25,17 @@ jQuery(document).ready(function ($) {
consultRemark: '', consultRemark: '',
assistStatus: 0, assistStatus: 0,
assistRemark: '', assistRemark: '',
unPleasureStatus: 0, unpleasureStatus: 0,
unPleasureEntity: 0, unpleasureEntity: 0,
unPleasureDetail: '', unpleasureDetail: '',
unPleasureDeptName: [], unpleasureDeptName: [],
unPleasureSolution: '', unpleasureSolution: '',
userAdvice: '', userAdvice: '',
revisitStatus: 0, revisitStatus: 0,
revisitRemark: '', revisitRemark: ''
consultStates: [ },
{value: 0, text: '请选择'},
{value: 1, text: '满意'}, callStates: [
{value: 2, text: '一般'},
{value: 3, text: '不满意'}
],
consultStates: [
{value: 0, text: '请选择'}, {value: 0, text: '请选择'},
{value: 1, text: '督导'}, {value: 1, text: '督导'},
{value: 2, text: '接通拒听'}, {value: 2, text: '接通拒听'},
...@@ -41,38 +50,39 @@ jQuery(document).ready(function ($) { ...@@ -41,38 +50,39 @@ jQuery(document).ready(function ($) {
{value: 1, text: '是'}, {value: 1, text: '是'},
{value: 2, text: '否'} {value: 2, text: '否'}
], ],
consultStates: [
{value: 0, text: '请选择'},
{value: 1, text: '满意'},
{value: 2, text: '一般'},
{value: 3, text: '不满意'}
],
assistStates: [ assistStates: [
{value: 0, text: '请选择'}, {value: 0, text: '请选择'},
{value: 1, text: '满意'}, {value: 1, text: '满意'},
{value: 2, text: '一般'}, {value: 2, text: '一般'},
{value: 3, text: '不满意'} {value: 3, text: '不满意'}
], ],
revisitStates: [ unpleasureStates:[
{value: 0, text: '请选择'}, {value: 0, text: '请选择'},
{value: 1, text: '未回访'}, {value: 1, text: '未处理'},
{value: 2, text: '推迟回访'}, {value: 2, text: '处理中'},
{value: 3, text: '不回访'}, {value: 3, text: '已处理'}
{value: 4, text: '已回访'},
{value: 5, text: '无法呼出'},
{value: 6, text: '用户不便'},
{value: 7, text: '助理添加标签'}
], ],
unpleasureEntities: [ unpleasureEntities: [
{value: 0, text: '请选择'}, {value: 0, text: '请选择'},
{value: 1, text: '咨询师'}, {value: 1, text: '咨询师'},
{value: 2, text: '接通拒听'}, {value: 2, text: '咨询师助理'},
{value: 3, text: '未接听'}, {value: 3, text: '平台'},
{value: 4, text: '未接通拒绝'}, {value: 4, text: '其他'}
{value: 5, text: '无法呼出'},
{value: 6, text: '用户不便'},
{value: 7, text: '助理添加标签'}
], ],
unpleasureStates:[ revisitStates: [
{value: 0, text: '请选择'}, {value: 0, text: '请选择'},
{value: 1, text: '未处理'}, {value: 1, text: '未回访'},
{value: 2, text: '处理中'}, {value: 2, text: '推迟回访'},
{value: 3, text: '已处理'} {value: 3, text: '不回访'},
] {value: 4, text: '已回访'}
],
auditDetails:[]
}, },
methods: { methods: {
...@@ -82,30 +92,31 @@ jQuery(document).ready(function ($) { ...@@ -82,30 +92,31 @@ jQuery(document).ready(function ($) {
var woId = urlParams.get('id'); var woId = urlParams.get('id');
var data = JSON.stringify( var data = JSON.stringify(
{ {
"assistRemark": woDetail.assistRemark, "id":woDetail.orderDetail.id,
"assistStatus": woDetail.assistStatus, "customerName": woDetail.orderDetail.customerName,
"callRemark": woDetail.callRemark, "customerUid": woDetail.orderDetail.customerUid,
"callStatus": woDetail.callStatus, "doctorName": woDetail.orderDetail.doctorName,
"consultRemark": woDetail.consultRemark, "doctorUid": woDetail.orderDetail.doctorUid,
"consultStatus": woDetail.consultStatus, "orderNum": woDetail.orderDetail.orderNum,
"customerName": woDetail.customerName, "phoneNum": woDetail.orderDetail.phoneNum,
"customerUid": woDetail.customerUid, "processName": woDetail.orderDetail.processName,
"doctorName": woDetail.doctorName, "processUid": woDetail.orderDetail.processUid,
"doctorUid": woDetail.doctorUid, "callStatus": woDetail.orderDetail.callStatus,
"orderNum": woDetail.orderNum, "callRemark": woDetail.orderDetail.callRemark,
"phoneNum": woDetail.phoneNum, "smsRemark": woDetail.orderDetail.smsRemark,
"processName": woDetail.processName, "smsStatus": woDetail.orderDetail.smsStatus,
"processUid": woDetail.processUid, "consultStatus": woDetail.orderDetail.consultStatus,
"revisitRemark": woDetail.revisitRemark, "consultRemark": woDetail.orderDetail.consultRemark,
"revisitStatus": woDetail.revisitStatus, "assistStatus": woDetail.orderDetail.assistStatus,
"smsRemark": woDetail.smsRemark, "assistRemark": woDetail.orderDetail.assistRemark,
"smsStatus": woDetail.smsStatus, "unpleasureStatus": woDetail.orderDetail.unpleasureStatus,
"unpleasureDeptName": woDetail.unpleasureDeptName, "unpleasureDetail": woDetail.orderDetail.unpleasureDetail,
"unpleasureDetail": woDetail.unpleasureDetail, "unpleasureEntity": woDetail.orderDetail.unpleasureEntity,
"unpleasureEntity": woDetail.unpleasureEntity, "unpleasureDeptName": woDetail.orderDetail.unpleasureDeptName,
"unpleasureSolution": woDetail.unpleasureSolution, "unpleasureSolution": woDetail.orderDetail.unpleasureSolution,
"unpleasureStatus": woDetail.unpleasureStatus, "userAdvice": woDetail.orderDetail.userAdvice,
"userAdvice": woDetail.userAdvice, "revisitStatus": woDetail.orderDetail.revisitStatus,
"revisitRemark": woDetail.orderDetail.revisitRemark,
"woId": woId "woId": woId
} }
); );
...@@ -121,6 +132,34 @@ jQuery(document).ready(function ($) { ...@@ -121,6 +132,34 @@ jQuery(document).ready(function ($) {
window.location.href = '/index.html' window.location.href = '/index.html'
} }
}); });
var data = JSON.stringify(
{
"id":woId,
"woProcessName": woDetail.orderDetail.processName,
"woProcessUid": woDetail.orderDetail.processUid,
"woType": woType,
"woStatus": 1,
"statusDisplay": "处理完成",
"orderNum": woDetail.orderDetail.orderNum
}
);
console.log(data);
$.ajax({
url: "/work/wo/update",
dataType: "json",
data: data,
type: 'post',
contentType: "application/json; charset=utf-8",
success: function (res) {
console.log(res);
window.location.href = '/index.html'
}
});
},
navigateToOrderList :function () {
window.location.href="/";
} }
} }
}) })
...@@ -137,13 +176,14 @@ jQuery(document).ready(function ($) { ...@@ -137,13 +176,14 @@ jQuery(document).ready(function ($) {
} }
); );
$.ajax({ $.ajax({
url: '/work/wo/detail', url: "/work/wo/detail",
dataType: "json", dataType: "json",
data: data, data: data,
type: 'post', type: 'post',
contentType: "application/json; charset=utf-8", contentType: "application/json; charset=utf-8",
success: function (res) { success: function (res) {
console.log(res); console.log(res.data);
woDetail.orderDetail = res.data;
} }
}); });
...@@ -151,18 +191,18 @@ jQuery(document).ready(function ($) { ...@@ -151,18 +191,18 @@ jQuery(document).ready(function ($) {
{ {
"fieldValue": woId, "fieldValue": woId,
"processUid": 1, "processUid": 1,
"tableName":'wo_revisit_detail' "tableName":auditTableName
} }
); );
$.ajax({ $.ajax({
url: '/work/auditTrace/list', url: "/work/auditTrace/list",
dataType: "json", dataType: "json",
data: data, data: data,
type: 'post', type: 'post',
contentType: "application/json; charset=utf-8", contentType: "application/json; charset=utf-8",
success: function (res) { success: function (res) {
console.log(res); console.log(res.data);
woDetail.auditDetails = res.data;
} }
}); });
} }
......
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" xmlns:v-on="http://www.w3.org/1999/xhtml" xmlns:v-bind="http://www.w3.org/1999/xhtml"> <html lang="en" xmlns:v-on="http://www.w3.org/1999/xhtml"
xmlns:v-bind="http://www.w3.org/1999/xhtml">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge"> <meta http-equiv="X-UA-Compatible" content="ie=edge">
...@@ -18,32 +20,35 @@ ...@@ -18,32 +20,35 @@
<script src="./js/bootstrap.min.js"></script> <script src="./js/bootstrap.min.js"></script>
</head> </head>
<body> <body>
<!-- 头部 --> <!-- 头部 -->
<header> <header>
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<div class="col-xs-4 col-sm-4 col-md-3"> <div class="col-xs-4 col-sm-4 col-md-3">
<a href="#" class="home"><i class="fa fa-home" aria-hidden="true"></i>YiDianLing.com</a> <a href="#" class="home"><i class="fa fa-home"
aria-hidden="true"></i>YiDianLing.com</a>
</div> </div>
<div class="col-xs-8 col-sm-8 col-md-9"> <div class="col-xs-8 col-sm-8 col-md-9">
<div class="row"> <div class="row">
<div class="col-sm-2 col-md-2 col-lg-5"> <div class="col-sm-2 col-md-2 col-lg-5">
<a href="#" class="bar"><i class="fa fa-bars" aria-hidden="true"></i></a> <a href="#" class="bar"><i class="fa fa-bars"
aria-hidden="true"></i></a>
</div> </div>
<div class="col-sm-10 col-md-10 col-lg-7 info"> <div class="col-sm-10 col-md-10 col-lg-7 info">
<a href="#">即将回收的客户<i class="circle">5</i></a> <a href="#">即将回收的客户<i class="circle">5</i></a>
<!--<a href="#"><i class="fa fa-upload" aria-hidden="true"></i>上传</a> <!--<a href="#"><i class="fa fa-upload" aria-hidden="true"></i>上传</a>
<a href="#"><i class="fa fa-upload" aria-hidden="true"></i>备用上传</a> <a href="#"><i class="fa fa-upload" aria-hidden="true"></i>备用上传</a>
<a href="#"><i class="fa fa-upload" aria-hidden="true"></i>海外收款</a>--> <a href="#"><i class="fa fa-upload" aria-hidden="true"></i>海外收款</a>-->
<a href="#" class="user-img"><img src="./images/avatar.jpg" alt="">admin</a> <a href="#" class="user-img"><img src="./images/avatar.jpg"
alt="">admin</a>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</header> </header>
<!-- 主体部分 --> <!-- 主体部分 -->
<div class="main" id="app"> <div class="main" id="app">
<!--<div v-for="item in abc">{{item}}</div>--> <!--<div v-for="item in abc">{{item}}</div>-->
<!--<select name="on-state" v-for="(item,index) in abc">--> <!--<select name="on-state" v-for="(item,index) in abc">-->
<!--<option :value='index'> {{item}}--> <!--<option :value='index'> {{item}}-->
...@@ -57,21 +62,21 @@ ...@@ -57,21 +62,21 @@
<div class="row"> <div class="row">
<!-- 左侧边栏 --> <!-- 左侧边栏 -->
<div class="col-xs-6 col-sm-4 col-md-2 aside"> <div class="col-xs-6 col-sm-4 col-md-2 aside">
<div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true"> <div class="panel-group" id="accordion" role="tablist"
aria-multiselectable="true">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading" role="tab" id="headingOne"> <div class="panel-heading" role="tab" id="headingOne">
<h4 class="panel-title"> <h4 class="panel-title">
<a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseOne" <a role="button" data-toggle="collapse"
aria-expanded="true" aria-controls="collapseOne"> data-parent="#accordion" href="#collapseOne"
<i class="fa fa-user" aria-hidden="true"></i><span> aria-expanded="true" aria-controls="collapseOne"> <i
用户 class="fa fa-user" aria-hidden="true"></i><span> 用户 </span> <i
</span> class="fa fa-angle-left right" aria-hidden="true"></i>
<i class="fa fa-angle-left right" aria-hidden="true"></i>
</a> </a>
</h4> </h4>
</div> </div>
<div id="collapseOne" class="panel-collapse collapse" role="tabpanel" <div id="collapseOne" class="panel-collapse collapse"
aria-labelledby="headingOne"> role="tabpanel" aria-labelledby="headingOne">
<div class="panel-body"> <div class="panel-body">
<!--<a href="#">我的工作台</a> <!--<a href="#">我的工作台</a>
<a href="#">我的工作台</a> <a href="#">我的工作台</a>
...@@ -84,15 +89,16 @@ ...@@ -84,15 +89,16 @@
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading" role="tab" id="headingTwo"> <div class="panel-heading" role="tab" id="headingTwo">
<h4 class="panel-title"> <h4 class="panel-title">
<a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" <a class="collapsed" role="button" data-toggle="collapse"
href="#collapseTwo" aria-expanded="false" aria-controls="collapseTwo"> data-parent="#accordion" href="#collapseTwo"
<i class="fa fa-diamond" aria-hidden="true"></i>业务 aria-expanded="false" aria-controls="collapseTwo"> <i
<i class="fa fa-angle-left right" aria-hidden="true"></i> class="fa fa-diamond" aria-hidden="true"></i>业务 <i
class="fa fa-angle-left right" aria-hidden="true"></i>
</a> </a>
</h4> </h4>
</div> </div>
<div id="collapseTwo" class="panel-collapse collapse" role="tabpanel" <div id="collapseTwo" class="panel-collapse collapse"
aria-labelledby="headingTwo"> role="tabpanel" aria-labelledby="headingTwo">
<div class="panel-body"> <div class="panel-body">
<!--<a href="#">我的工作台</a> <!--<a href="#">我的工作台</a>
<a href="#">我的工作台</a> <a href="#">我的工作台</a>
...@@ -105,15 +111,16 @@ ...@@ -105,15 +111,16 @@
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading" role="tab" id="headingThree"> <div class="panel-heading" role="tab" id="headingThree">
<h4 class="panel-title"> <h4 class="panel-title">
<a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" <a class="collapsed" role="button" data-toggle="collapse"
href="#collapseThree" aria-expanded="false" aria-controls="collapseThree"> data-parent="#accordion" href="#collapseThree"
<i class="fa fa-user-secret" aria-hidden="true"></i> aria-expanded="false" aria-controls="collapseThree"> <i
专家<i class="fa fa-angle-left right" aria-hidden="true"></i> class="fa fa-user-secret" aria-hidden="true"></i> 专家<i
class="fa fa-angle-left right" aria-hidden="true"></i>
</a> </a>
</h4> </h4>
</div> </div>
<div id="collapseThree" class="panel-collapse collapse" role="tabpanel" <div id="collapseThree" class="panel-collapse collapse"
aria-labelledby="headingThree"> role="tabpanel" aria-labelledby="headingThree">
<div class="panel-body"> <div class="panel-body">
<!--<a href="#">我的工作台</a> <!--<a href="#">我的工作台</a>
<a href="#">我的工作台</a> <a href="#">我的工作台</a>
...@@ -126,15 +133,16 @@ ...@@ -126,15 +133,16 @@
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading" role="tab" id="headingFour"> <div class="panel-heading" role="tab" id="headingFour">
<h4 class="panel-title"> <h4 class="panel-title">
<a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" <a class="collapsed" role="button" data-toggle="collapse"
href="#collapseFour" aria-expanded="false" aria-controls="collapseFour"> data-parent="#accordion" href="#collapseFour"
<i class="fa fa-bar-chart" aria-hidden="true"></i> aria-expanded="false" aria-controls="collapseFour"> <i
市场运营<i class="fa fa-angle-left right" aria-hidden="true"></i> class="fa fa-bar-chart" aria-hidden="true"></i> 市场运营<i
class="fa fa-angle-left right" aria-hidden="true"></i>
</a> </a>
</h4> </h4>
</div> </div>
<div id="collapseFour" class="panel-collapse collapse" role="tabpanel" <div id="collapseFour" class="panel-collapse collapse"
aria-labelledby="headingFour"> role="tabpanel" aria-labelledby="headingFour">
<div class="panel-body"> <div class="panel-body">
<!--<a href="#">我的工作台</a> <!--<a href="#">我的工作台</a>
<a href="#">我的工作台</a> <a href="#">我的工作台</a>
...@@ -147,48 +155,61 @@ ...@@ -147,48 +155,61 @@
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading" role="tab" id="headingFive"> <div class="panel-heading" role="tab" id="headingFive">
<h4 class="panel-title"> <h4 class="panel-title">
<a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" <a class="collapsed" role="button" data-toggle="collapse"
href="#collapseFive" aria-expanded="false" aria-controls="collapseFive"> data-parent="#accordion" href="#collapseFive"
<i class="fa fa-bookmark" aria-hidden="true"></i>工单管理<i aria-expanded="false" aria-controls="collapseFive"> <i
class="fa fa-bookmark" aria-hidden="true"></i>工单管理<i
class="fa fa-angle-left right" aria-hidden="true"></i> class="fa fa-angle-left right" aria-hidden="true"></i>
</a> </a>
</h4> </h4>
</div> </div>
<div id="collapseFive" class="panel-collapse collapse in" role="tabpanel" <div id="collapseFive" class="panel-collapse collapse in"
aria-labelledby="headingFive"> role="tabpanel" aria-labelledby="headingFive">
<div class="panel-body"> <div class="panel-body">
<a href="/index.html">我的工作台</a> <a href="/index.html">我的工作台</a> <a href="/sysWoConfig.html">系统工单规则配置</a>
<a href="/sysWoConfig.html">系统工单规则配置</a>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="col-xs-6 col-sm-8 col-md-10 digital-container type-container" id="woDetail"> <div
class="col-xs-6 col-sm-8 col-md-10 digital-container type-container"
id="woDetail">
<div class="breadcell"> <div class="breadcell">
<a href="#">首页</a><span>/</span><a href="#">回访订单列表</a> <a href="#">首页</a><span>/</span><a href="#" v-on:click="navigateToOrderList()">回访订单列表</a>
</div> </div>
<h4 class="particulars">回访记录</h4> <h4 class="particulars">回访记录</h4>
<div class="subnav"> <div class="subnav">
<p>订单号:<span class="colorspan">921348348925429</span></p> <!-- <p>订单号:<span class="colorspan">921348348925429</span></p> -->
<p>咨询师:<span class="colorspan">蓝奥</span></p> <p>
<p>手机号:<a class="phone">查看手机号</a></p> 订单号:<span class="colorspan">{{orderDetail.orderNum}}</span>
<p>接受客服:<span>范丽娜</span></p> </p>
<p>回访人员(已分配):<span>范丽娜</span></p> <p>
咨询师:<span class="colorspan">{{orderDetail.doctorName}}</span>
</p>
<p>
手机号:<a class="phone">查看手机号</a>
</p>
<p>
接受客服:<span>{{orderDetail.customerName}}</span>
</p>
<p>
回访人员(已分配):<span>{{orderDetail.processName}}</span>
</p>
</div> </div>
<div class="particulars"> <div class="particulars">
<span class="bg"></span> <span class="bg"></span>
<div class="title"> <div class="title">
<span>接通状态:</span> <span>接通状态:</span> <select name="on-state"
<select v-model="callStatus"> v-model="orderDetail.callStatus">
<option v-for="(item,index) in consultStates" :value='index'> {{item.text}} <option v-for="(item,index) in callStates" :value='index'>
</option> {{item.text}}</option>
</select> </select>
</div> </div>
<div class="beizhu"> <div class="beizhu">
<span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</span><textarea name="beizhu" id="1231" <span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</span>
cols="150" <textarea name="beizhu" id="1231" cols="150" rows="2"
rows="2"></textarea> v-model="orderDetail.callRemark"></textarea>
</div> </div>
</div> </div>
...@@ -196,60 +217,63 @@ ...@@ -196,60 +217,63 @@
<div class="particulars"> <div class="particulars">
<span class="bg"></span> <span class="bg"></span>
<div class="title" > <div class="title">
<span>短信发送:</span> <span>短信发送:</span> <select name="on-state"
<select name="on-state" v-model="smsStatus"> v-model="orderDetail.smsStatus">
<option v-for="(item,index) in smsStates" :value='index'> {{item.text}} <option v-for="(item,index) in smsStates" :value='index'>
</option> {{item.text}}</option>
</select> </select>
</div> </div>
<div class="beizhu"> <div class="beizhu">
<span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</span><textarea name="beizhu" id="123ff" <span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</span>
cols="150" <textarea name="beizhu" id="123ff" cols="150" rows="2"
rows="2"></textarea> v-model="orderDetail.smsRemark"></textarea>
</div> </div>
</div> </div>
<div class="particulars"> <div class="particulars">
<span class="bg"></span> <span class="bg"></span>
<div class="title" > <div class="title">
<span>咨询效果:</span> <span>咨询效果:</span> <select name="on-state"
<select name="on-state" v-model="consultStatus"> v-model="orderDetail.consultStatus">
<option v-for="(item,index) in consultStates" :value='index'> {{item.text}} <option v-for="(item,index) in consultStates" :value='index'>
</option> {{item.text}}</option>
</select> </select>
</div> </div>
<div class="beizhu"> <div class="beizhu">
<span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;由:</span><textarea name="beizhu" <span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;由:</span>
cols="150" <textarea name="beizhu" cols="150" rows="2"
rows="2"></textarea> v-model="orderDetail.consultRemark"></textarea>
</div> </div>
</div> </div>
<div class="particulars"> <div class="particulars">
<span class="bg"></span> <span class="bg"></span>
<div class="title" > <div class="title">
<span>助理服务:</span> <span>助理服务:</span> <select name="on-state"
<select name="on-state" v-model="assistStatus"> v-model="orderDetail.assistStatus">
<option v-for="(item,index) in assistStates" :value='index'> {{item.text}} <option v-for="(item,index) in assistStates" :value='index'>
</option> {{item.text}}</option>
</select> </select>
</div> </div>
<div class="beizhu"> <div class="beizhu">
<span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;由:</span><textarea name="beizhu" id="xvasfd1" <span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;由:</span>
cols="150" <textarea name="beizhu" id="xvasfd1" cols="150" rows="2"
rows="2"></textarea> v-model="orderDetail.assistRemark"></textarea>
</div> </div>
</div> </div>
<div class="particulars"> <div class="particulars">
<div class="pink"> <div class="pink">
<span class="bg"></span> <span class="bg"></span>
<div class="title"> <div class="title">
<span>处理状态:</span> <span>处理状态:</span> <select name="on-state"
<select name="on-state" v-model="unPleasureStatus"> v-model="orderDetail.unpleasureStatus">
<option v-for="(item,index) in unpleasureStates" :value='index'> {{item.text}} <option v-for="(item,index) in unpleasureStates" :value='index'>
{{item.text}}
</select> </select>
</div> </div>
<div class="beizhu"> <div class="beizhu">
<span>不满意内容:</span><textarea name="beizhu" id="asfasdf" cols="150" rows="2"></textarea> <span>不满意内容:</span>
<textarea name="beizhu" id="asfasdf" cols="150" rows="2"
v-model="orderDetail.unpleasureRemark"></textarea>
</div> </div>
</div> </div>
</div> </div>
...@@ -257,67 +281,72 @@ ...@@ -257,67 +281,72 @@
<div class="pink"> <div class="pink">
<span class="bg"></span> <span class="bg"></span>
<div class="title"> <div class="title">
<span>不满意对象:</span> <span>不满意对象:</span> <select name="on-state"
<select name="on-state" v-model="unPleasureEntity"> v-model="orderDetail.unpleasureEntity">
<option v-for="(item,index) in unpleasureEntities" :value='index'> {{item.text}} <option v-for="(item,index) in unpleasureEntities"
</select> :value='index'>{{item.text}}
<input type="text"> </select> <input type="text">
</div> </div>
<div class="title"> <div class="title">
<span>归属部门:</span> <span>归属部门:</span>
<div class="checkbox"> <div class="checkbox">
<label class="checkbox-inline"> <label class="checkbox-inline"> <input type="checkbox"
<input type="checkbox" v-model="unPleasureDeptName" value='0' id="xn"> 心暖 v-model="orderDetail.unpleasureDeptName" value='0' id="xn">
</label> 心暖
<label class="checkbox-inline"> </label> <label class="checkbox-inline"> <input type="checkbox"
<input type="checkbox" v-model="unPleasureDeptName" value='1' id="hs"> 好柿 v-model="orderDetail.unpleasureDeptName" value='1' id="hs">
</label> 好柿
<label class="checkbox-inline"> </label> <label class="checkbox-inline"> <input type="checkbox"
<input type="checkbox" v-model="unPleasureDeptName" value='2' id="xqtqjd"> 心期天旗舰店 v-model="orderDetail.unpleasureDeptName" value='2' id="xqtqjd">
</label> 心期天旗舰店
<label class="checkbox-inline"> </label> <label class="checkbox-inline"> <input type="checkbox"
<input type="checkbox" v-model="unPleasureDeptName" value='3' id="ydlqjd"> 壹点灵旗舰店 v-model="orderDetail.unpleasureDeptName" value='3' id="ydlqjd">
</label> 壹点灵旗舰店
<label class="checkbox-inline"> </label> <label class="checkbox-inline"> <input type="checkbox"
<input type="checkbox" v-model="unPleasureDeptName" value='3' id="szb"> 师资部 v-model="orderDetail.unpleasureDeptName" value='3' id="szb">
</label> 师资部
<label class="checkbox-inline"> </label> <label class="checkbox-inline"> <input type="checkbox"
<input type="checkbox" v-model="unPleasureDeptName" value='4' id="kfzx"> 客服中心 v-model="orderDetail.unpleasureDeptName" value='4' id="kfzx">
</label> 客服中心
<label class="checkbox-inline"> </label> <label class="checkbox-inline"> <input type="checkbox"
<input type="checkbox" v-model="unPleasureDeptName" value='5' id="cpb"> 产品部 v-model="orderDetail.unpleasureDeptName" value='5' id="cpb">
</label> 产品部
<label class="checkbox-inline"> </label> <label class="checkbox-inline"> <input type="checkbox"
<input type="checkbox" v-model="unPleasureDeptName" value='6' id="jsb"> 技术部 v-model="orderDetail.unpleasureDeptName" value='6' id="jsb">
</label> 技术部
<label class="checkbox-inline"> </label> <label class="checkbox-inline"> <input type="checkbox"
<input type="checkbox" v-model="unPleasureDeptName" value='7' id="cwb"> 财务部 v-model="orderDetail.unpleasureDeptName" value='7' id="cwb">
财务部
</label> </label>
</div> </div>
</div> </div>
<div class="beizhu"> <div class="beizhu">
<span>处理方案:</span><textarea name="beizhu" cols="150" rows="2" v-model="unPleasureSolution"></textarea> <span>处理方案:</span>
<textarea name="beizhu" cols="150" rows="2"
v-model="orderDetail.unpleasureSolution"></textarea>
</div> </div>
</div> </div>
</div> </div>
<div class="particulars"> <div class="particulars">
<span class="bg"></span> <span class="bg"></span>
<div class="beizhu"> <div class="beizhu">
<span>用户建议:</span><textarea name="beizhu" cols="150" rows="2"></textarea> <span>用户建议:</span>
<textarea name="beizhu" cols="150" rows="2"
v-model="orderDetail.userAdvice"></textarea>
</div> </div>
</div> </div>
<div class="particulars"> <div class="particulars">
<span class="bg"></span> <span class="bg"></span>
<div class="title"> <div class="title">
<span>回访状态:</span> <span>回访状态:</span> <select name="on-state"
<select name="on-state" v-model="revisitStatus"> v-model="orderDetail.revisitStatus">
<option v-for="(item,index) in revisitStates" :value="index">{{item.text}}</option> <option v-for="(item,index) in revisitStates" :value="index">{{item.text}}</option>
</select> </select>
</div> </div>
<div class="beizhu"> <div class="beizhu">
<span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</span><textarea name="beizhu" v-model="revisitRemark" <span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</span>
cols="150" <textarea name="beizhu" cols="150" rows="2"
rows="2"></textarea> v-model="orderDetail.revisitRemark"></textarea>
</div> </div>
</div> </div>
<button type="button" class="btn btn-primary" @click="saveWODetail">处理完成</button> <button type="button" class="btn btn-primary" @click="saveWODetail">处理完成</button>
...@@ -334,11 +363,11 @@ ...@@ -334,11 +363,11 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr> <tr class="active" v-for="detail in auditDetails" v-bind:key="detail.id">
<td scope="row">2018-06-23 13:42:23</td> <td>{{ detail.operateTime }}</td>
<td>王丽品</td> <td>{{ detail.operatorName }}</td>
<td>分配</td> <td>{{ detail.actionType }}</td>
<td>分配订单,回访人员改成:范丽娜</td> <td>{{ detail.actionDetail }}</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
...@@ -346,19 +375,19 @@ ...@@ -346,19 +375,19 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<script> <script>
$(document).ready(function () { $(document).ready(function() {
$('.bar').click(function () { $('.bar').click(function() {
$('.aside').toggleClass('visible'); $('.aside').toggleClass('visible');
$('.digital-container').toggleClass('width'); $('.digital-container').toggleClass('width');
}) })
$('.nav-tabs a').click(function (e) { $('.nav-tabs a').click(function(e) {
e.preventDefault() e.preventDefault()
$(this).tab('show') $(this).tab('show')
}) })
}); });
</script> </script>
</body> </body>
</html> </html>
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