Commit dadefd53 authored by 余苗苗's avatar 余苗苗

根据UI调整页面

parent dd41f436
...@@ -61,6 +61,7 @@ ...@@ -61,6 +61,7 @@
background: #F1F3F9; background: #F1F3F9;
border: none; border: none;
height: 30px; height: 30px;
border-radius: 4px;
} }
.cooperate .all-cooperate-serch .seach-input { .cooperate .all-cooperate-serch .seach-input {
margin-right: 8px; margin-right: 8px;
...@@ -118,19 +119,22 @@ ...@@ -118,19 +119,22 @@
width: 20%; width: 20%;
} }
.cooperate-right .cooperate-content .table-body td:nth-child(3),.cooperate-right .cooperate-content .table-header th:nth-child(3){ .cooperate-right .cooperate-content .table-body td:nth-child(3),.cooperate-right .cooperate-content .table-header th:nth-child(3){
width: 20%; width: 30%;
} }
.cooperate-right .cooperate-content .table-body td:nth-child(4),.cooperate-right .cooperate-content .table-header th:nth-child(4){ .cooperate-right .cooperate-content .table-body td:nth-child(4),.cooperate-right .cooperate-content .table-header th:nth-child(4){
width: 20%; width: 20%;
} }
.cooperate-right .cooperate-content .table-body td:nth-child(5),.cooperate-right .cooperate-content .table-header th:nth-child(5){ .cooperate-right .cooperate-content .table-body td:nth-child(5),.cooperate-right .cooperate-content .table-header th:nth-child(5){
width: 20%; width: 10%;
}
.cooperate-right .cooperate-content .table-body td {
font-size: 12px;
} }
.cooperate-right .cooperate-content .table-cell{ .cooperate-right .cooperate-content .table-cell{
border: 1px solid #E2E2E2; border: 1px solid #E2E2E2;
margin: 5px 0; margin: 5px 0;
border-radius: 5px; border-radius: 5px;
height: 74px; height: 40px;
font-size: 12px; font-size: 12px;
} }
.cooperate-right .cooperate-content .table-cell:nth-of-type(odd){ .cooperate-right .cooperate-content .table-cell:nth-of-type(odd){
...@@ -143,8 +147,10 @@ ...@@ -143,8 +147,10 @@
.cooperate-right .cooperate-content table th{ .cooperate-right .cooperate-content table th{
background: #eef1fa; background: #eef1fa;
color: #666; color: #666666;
text-align: center; text-align: center;
font-size: 12px;
font-weight: normal;
} }
.cooperate-right .cooperate-content table td .cell{ .cooperate-right .cooperate-content table td .cell{
/*font-size: 12px;*/ /*font-size: 12px;*/
...@@ -160,7 +166,7 @@ ...@@ -160,7 +166,7 @@
/********************详情start*******************/ /********************详情start*******************/
.cooperate-detail{ .cooperate-detail{
width: 720px; /*width: 570px;*/
height: 630px; height: 630px;
float: right; float: right;
} }
...@@ -378,6 +384,9 @@ ...@@ -378,6 +384,9 @@
font-size: 12px; font-size: 12px;
color: #999; color: #999;
} }
.add-operate{
float: none !important;
}
.add-operate form{ .add-operate form{
/*width: 500px;*/ /*width: 500px;*/
height: 523px; height: 523px;
......
...@@ -31,12 +31,10 @@ ...@@ -31,12 +31,10 @@
<el-option :label="item.label" :value="item.value" :key='item.label' v-for='(item,index) in search.options1'></el-option> <el-option :label="item.label" :value="item.value" :key='item.label' v-for='(item,index) in search.options1'></el-option>
</el-select> </el-select>
<el-input class="seach-input" v-model='search.name' prefix-icon="el-icon-search" placeholder='输入名称、联系人或区域' size="mini"></el-input> <el-input class="seach-input" v-model='search.name' prefix-icon="el-icon-search" placeholder='输入名称、联系人或区域' size="mini"></el-input>
<el-button type='primary' class='firstbackgroud_blue' size="mini">搜索</el-button> <el-button type='primary' class='firstbackgroud_blue firstborder_blue' size="mini">搜索</el-button>
<el-button type='primary' class='firstbackgroud_blue addbutton' @click="addOperate()" size="mini">新增授权点</el-button> <el-button type='primary' class='firstbackgroud_blue addbutton firstborder_blue' @click="addOperate()" size="mini">新增授权点</el-button>
</div> </div>
<div class="cooperate-content"> <div class="cooperate-content">
<table class="table-header"> <table class="table-header">
<tr > <tr >
<th>授权点</th> <th>授权点</th>
...@@ -81,7 +79,8 @@ ...@@ -81,7 +79,8 @@
</div> </div>
</body> </body>
<!-- 先引入 Vue --> <!-- 先引入 Vue -->
<script src="https://unpkg.com/vue/dist/vue.js"></script> <script src="./../static/js/vue.js"></script>
<script src="./../static/js/jquery.js"></script>
<!-- 引入组件库 --> <!-- 引入组件库 -->
<script src="https://unpkg.com/element-ui/lib/index.js"></script> <script src="https://unpkg.com/element-ui/lib/index.js"></script>
<script src="./../static/js/common.js"></script> <script src="./../static/js/common.js"></script>
...@@ -147,27 +146,24 @@ ...@@ -147,27 +146,24 @@
created(){ created(){
}, },
methods:{ methods:{
//左侧切换
handleSelect(key, keyPath) { handleSelect(key, keyPath) {
this.tabindex = key; this.tabindex = key;
switch(Number(key)){
case 1:
// this.modal = VAll
break;
default:
this.modal = null
break;
}
}, },
// 分页
handleCurrentChange(page) { handleCurrentChange(page) {
}, },
checkData(row,event, column){ // 详情
checkData(row){
this.modalData = row; this.modalData = row;
this.modal = vDetail; this.modal = vDetail;
}, },
closeChild(){ closeChild(){
this.modal = null this.modal = null
}, },
//新增授权
addOperate(){ addOperate(){
this.modalData = {type:'creat'}; this.modalData = {type:'creat'};
this.modal = addOperate; this.modal = addOperate;
......
// 新增授权点
var addOperate={ var addOperate={
template: ` template: `
<el-dialog :visible.sync="dialog.show" custom-class='cooperate-detail add-operate ' @close="handleClose" :lock-scroll="false" :show-close='true'> <el-dialog width="660px" :visible.sync="dialog.show" custom-class='cooperate-detail add-operate ' @close="handleClose" :append-to-body="true" :show-close='true'>
<div slot='title' class="el-dialog__title"> <div slot='title' class="el-dialog__title">
<i class="iconfont iconhezuo"></i> <i class="iconfont iconhezuo"></i>
{{dialog.title}} {{dialog.title}}
...@@ -187,7 +188,6 @@ var addOperate={ ...@@ -187,7 +188,6 @@ var addOperate={
} }
}, },
created(){ created(){
if(this.modalData.type=='creat'){ if(this.modalData.type=='creat'){
this.dialog.title = '新增授权点'; this.dialog.title = '新增授权点';
this.isCreat = true; this.isCreat = true;
...@@ -211,24 +211,30 @@ var addOperate={ ...@@ -211,24 +211,30 @@ var addOperate={
const self = this; const self = this;
self.$refs[formName].validate((valid) => { self.$refs[formName].validate((valid) => {
if (valid) { if (valid) {
//提交表单
} else { } else {
return false; return false;
} }
}); });
}, },
// 增加品类
change_name(){ change_name(){
this.select_names.push({name:this.check_name}) this.select_names.push({name:this.check_name})
}, },
// 删除品类
delete_name(index){ delete_name(index){
this.select_names.splice(index,1) this.select_names.splice(index,1)
}, },
// 新增区域
change_address(){ change_address(){
this.select_address.push({name:this.check_address[2]}) this.select_address.push({name:this.check_address[2]})
console.log(this.check_address,this.select_address) console.log(this.check_address,this.select_address)
}, },
// 删除区域
delete_address(index){ delete_address(index){
this.select_address.splice(index,1) this.select_address.splice(index,1)
}, },
//上传图片
handleAvatarSuccess(res, file) { handleAvatarSuccess(res, file) {
this.form.imageUrl = URL.createObjectURL(file.raw); this.form.imageUrl = URL.createObjectURL(file.raw);
}, },
......
// 详情
var vDetail={ var vDetail={
template: ` template: `
<el-dialog :visible.sync="dialog.show" custom-class='cooperate-detail animated slideInRight' @close="handleClose" :append-to-body="true" :show-close='true'> <el-dialog width="570px" :visible.sync="dialog.show" custom-class='cooperate-detail animated slideInRight' @close="handleClose" :append-to-body="true" :show-close='true'>
<div slot='title' class="el-dialog__title"> <div slot='title' class="el-dialog__title">
<i class="iconfont iconhezuo"></i> <i class="iconfont iconhezuo"></i>
{{dialog.title}} {{dialog.title}}
...@@ -30,7 +31,7 @@ var vDetail={ ...@@ -30,7 +31,7 @@ var vDetail={
<p>认证方式: <span>企业认证</span></p> <p>认证方式: <span>企业认证</span></p>
<p>认证信息:<span>深圳市精诚家电维修有限公司 0102198902010215</span></p> <p>认证信息:<span>深圳市精诚家电维修有限公司 0102198902010215</span></p>
<p>认证图片: <p>认证图片:
<img src="../static/images/dog.jpeg" alt="" width="60px" height="60px" style="vertical-align: text-top;"> <img src="../static/images/dog.jpeg" alt="" width="120px" height="120px" style="vertical-align: text-top;">
</p> </p>
</div> </div>
</el-tab-pane> </el-tab-pane>
...@@ -58,10 +59,7 @@ var vDetail={ ...@@ -58,10 +59,7 @@ var vDetail={
<p>授权ID:<span>31E8792IWE73</span></p> <p>授权ID:<span>31E8792IWE73</span></p>
<p>授权密钥:<span>31E8792IWE7331E8792IWE7331E8792IWE73</span></p> <p>授权密钥:<span>31E8792IWE7331E8792IWE7331E8792IWE73</span></p>
<p>接单方式一:<span style="color: #5874D8;text-decoration: underline">API对接</span></p> <p>接单方式一:<span style="color: #5874D8;text-decoration: underline">API对接</span></p>
<p>接单方式二:<span>小程序</span></p>
</div> </div>
<div class="wechat"></div>
<div class="wechatTip">扫一扫,登录小程序</div>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
......
...@@ -15,7 +15,8 @@ ...@@ -15,7 +15,8 @@
</div> </div>
</body> </body>
<!-- 先引入 Vue --> <!-- 先引入 Vue -->
<script src="https://unpkg.com/vue/dist/vue.js"></script> <script src="./../static/js/vue.js"></script>
<script src="./../static/js/jquery.js"></script>
<!-- 引入组件库 --> <!-- 引入组件库 -->
<script src="https://unpkg.com/element-ui/lib/index.js"></script> <script src="https://unpkg.com/element-ui/lib/index.js"></script>
<script src="./../static/js/common.js"></script> <script src="./../static/js/common.js"></script>
......
...@@ -15,7 +15,8 @@ ...@@ -15,7 +15,8 @@
</div> </div>
</body> </body>
<!-- 先引入 Vue --> <!-- 先引入 Vue -->
<script src="https://unpkg.com/vue/dist/vue.js"></script> <script src="./../static/js/vue.js"></script>
<script src="./../static/js/jquery.js"></script>
<!-- 引入组件库 --> <!-- 引入组件库 -->
<script src="https://unpkg.com/element-ui/lib/index.js"></script> <script src="https://unpkg.com/element-ui/lib/index.js"></script>
<script src="./../static/js/common.js"></script> <script src="./../static/js/common.js"></script>
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
</div> </div>
</body> </body>
<!-- 先引入 Vue --> <!-- 先引入 Vue -->
<script src="https://unpkg.com/vue/dist/vue.js"></script> <script src="./../static/js/vue.js"></script>
<!-- 引入组件库 --> <!-- 引入组件库 -->
<script src="https://unpkg.com/element-ui/lib/index.js"></script> <script src="https://unpkg.com/element-ui/lib/index.js"></script>
<script src="./../static/js/common.js"></script> <script src="./../static/js/common.js"></script>
...@@ -54,19 +54,7 @@ ...@@ -54,19 +54,7 @@
} }
}, },
methods:{ methods:{
handleSelect:function(){ //切换
},
handleCurrentChange:function(){
},
checkDetail(item){
this.modalData = item;
this.modal = Detail;
},
closeChild(){
this.modal = null
},
handleSelect(key, keyPath) { handleSelect(key, keyPath) {
this.tabindex = key; this.tabindex = key;
switch(Number(key)){ switch(Number(key)){
......
...@@ -6,8 +6,7 @@ ...@@ -6,8 +6,7 @@
<link rel="stylesheet" href="./../static/css/main.css"> <link rel="stylesheet" href="./../static/css/main.css">
<link rel="stylesheet" href="./order.css"> <link rel="stylesheet" href="./order.css">
<link rel="stylesheet" href="./../static/css/animate.css"> <link rel="stylesheet" href="./../static/css/animate.css">
<link rel="stylesheet" href="https://at.alicdn.com/t/font_1195086_k054bf1kprn.css"> <link rel="stylesheet" href="https://at.alicdn.com/t/font_1195086_hi1wus9dyiu.css">
</head> </head>
<body> <body>
<div id="app"> <div id="app">
...@@ -45,7 +44,6 @@ ...@@ -45,7 +44,6 @@
<i class='el-icon-caret-top' v-if="item.id==1 || item.id==6 || item.id==8"></i> <i class='el-icon-caret-top' v-if="item.id==1 || item.id==6 || item.id==8"></i>
<i class='el-icon-caret-bottom' v-if="item.id==2 || item.id==7 ||item.id==9"></i> <i class='el-icon-caret-bottom' v-if="item.id==2 || item.id==7 ||item.id==9"></i>
</div> </div>
</div> </div>
</el-popover> </el-popover>
</div> </div>
...@@ -56,14 +54,22 @@ ...@@ -56,14 +54,22 @@
<span :class="item.id==1?'type1':'type2'">{{item.server}}</span> <span :class="item.id==1?'type1':'type2'">{{item.server}}</span>
美的洗衣机--清理 美的洗衣机--清理
<div class="all-box-topright firsttext_blue"> <div class="all-box-topright firsttext_blue">
<i class='iconfont iconfenpei' @click.stop=''></i> <template>
<span v-if="item.id=='1'"> <span v-if="item.status==1 || item.status==2 || item.status==3 || item.staus==6">
<i class='iconfont iconxing start1' @click.stop=''></i> <i class='iconfont iconfenpei' @click.stop=''></i>
</span>
<span v-else-if="item.status==4">
<i class='iconfont iconquequan' @click.stop=''></i>
</span>
<span v-else-if="item.status==5"></span>
</template>
<span v-if="index==0">
<i class='iconfont iconloudou1 start2' @click.stop='' ></i>
</span> </span>
<span v-else> <span v-else>
<i class='iconfont iconloudou1 start2' @click.stop='' ></i> <i class='iconfont iconxing start1' @click.stop=''></i>
</span> </span>
<i class='iconfont iconxiaoxi1' @click.stop=''></i> <i class='iconfont iconxiaoxi1' @click.stop=''></i>
</div> </div>
</div> </div>
...@@ -114,12 +120,12 @@ ...@@ -114,12 +120,12 @@
</div> </div>
</body> </body>
<!-- 先引入 Vue --> <!-- 先引入 Vue -->
<script src="https://unpkg.com/vue/dist/vue.js"></script> <!--<script src="https://unpkg.com/vue/dist/vue.js"></script>-->
<script src="./../static/js/vue.js"></script>
<script src="./../static/js/jquery.js"></script> <script src="./../static/js/jquery.js"></script>
<!-- 引入组件库 --> <!-- 引入组件库 -->
<script src="https://unpkg.com/element-ui/lib/index.js"></script> <script src="https://unpkg.com/element-ui/lib/index.js"></script>
<script src="./../static/js/common.js"></script> <script src="./../static/js/common.js"></script>
<script src="./js/orderDetail.js"></script>
<script src="./js/beCompleting.js"></script> <script src="./js/beCompleting.js"></script>
<script src="./js/beRighting.js"></script> <script src="./js/beRighting.js"></script>
<script src="./js/refuse.js"></script> <script src="./js/refuse.js"></script>
...@@ -129,7 +135,7 @@ ...@@ -129,7 +135,7 @@
<script> <script>
new Vue({ new Vue({
el: '#app', el: '#app',
components: {commonHeader,Detail,beCompleting,beRighting,VRefuse,settlePrice,hasDone,Deliver}, components: {commonHeader,beCompleting,beRighting,VRefuse,settlePrice,hasDone,Deliver},
data: function() { data: function() {
return { return {
activeIndex:'9',tabindex:'9',modal:null,active_header:'./../order/index.html', activeIndex:'9',tabindex:'9',modal:null,active_header:'./../order/index.html',
...@@ -148,24 +154,12 @@ ...@@ -148,24 +154,12 @@
type:'',time:'',options1:[],options2:[],name:'' type:'',time:'',options1:[],options2:[],name:''
}, },
tableData:[ tableData:[
{id:'1',statusText:'待派单',server:'保内'}, {id:'1',statusText:'待派单',server:'保内',status:1},
{id:'2',statusText:'待分配',server:'保外'}, {id:'2',statusText:'待分配',server:'保外',status:2},
{id:'3',statusText:'待完工',server:'保外'}, {id:'3',statusText:'待完工',server:'保外',status:3},
{id:'4',statusText:'待确权',server:'保外'}, {id:'4',statusText:'待确权',server:'保外',status:4},
{id:'5',statusText:'已完成',server:'保外'}, {id:'5',statusText:'已完成',server:'保外',status:5},
{id:'6',statusText:'已退回',server:'保外'}, {id:'6',statusText:'已退回',server:'保外',status:6},
{id:'1',statusText:'待派单',server:'保内'},
{id:'2',statusText:'待分配',server:'保外'},
{id:'3',statusText:'待完工',server:'保外'},
{id:'4',statusText:'待确权',server:'保外'},
{id:'5',statusText:'已完成',server:'保外'},
{id:'6',statusText:'已退回',server:'保外'},
{id:'1',statusText:'待派单',server:'保内'},
{id:'2',statusText:'待分配',server:'保外'},
{id:'3',statusText:'待完工',server:'保外'},
{id:'4',statusText:'待确权',server:'保外'},
{id:'5',statusText:'已完成',server:'保外'},
{id:'6',statusText:'已退回',server:'保外'},
], ],
filters:[ filters:[
{id:'1',name:'创建时间'}, {id:'1',name:'创建时间'},
...@@ -184,44 +178,39 @@ ...@@ -184,44 +178,39 @@
modal:null,modalData:{}, modal:null,modalData:{},
} }
}, },
mounted(){
},
methods:{ methods:{
handleSelect:function(){ // 分页
handleCurrentChange(){
},
handleCurrentChange:function(){
}, },
//工单操作
checkDetail(item){ checkDetail(item){
if(item.id=='1'){ if(item.status=='1'){
//待派单 //待派单
this.modalData = item; this.modalData = item;
this.modal = Deliver; this.modal = Deliver;
} }
if(item.id=='3'){ if(item.status=='3'){
//待完工 //待完工
this.modalData = item; this.modalData = item;
this.modal = beCompleting; this.modal = beCompleting;
} }
if(item.id=='4'){ if(item.status=='4'){
//待确权 //待确权
this.modalData = item; this.modalData = item;
this.modal = beRighting; this.modal = beRighting;
} }
if(item.id=='5'){ if(item.status=='5'){
//已完成 //已完成
this.modalData = item; this.modalData = item;
this.modal = hasDone; this.modal = hasDone;
} }
return
console.log(item)
this.modalData = {status:item.id,statusText:item.statusText};
this.modal = Detail;
}, },
// 关闭子组件
closeChild(){ closeChild(){
this.modal = null this.modal = null
}, },
// 新建工单
creatOrder(){ creatOrder(){
window.location.href = './addOrder.html' window.location.href = './addOrder.html'
} }
......
//智能新建
var addAll={ var addAll={
template: ` template: `
<div> <div>
......
// 单条新建
var addOne={ var addOne={
template: ` template: `
<div > <div >
...@@ -96,13 +97,13 @@ var addOne={ ...@@ -96,13 +97,13 @@ var addOne={
} }
}, },
created(){ created(){
console.log(this.modalData)
}, },
methods:{ methods:{
saveFun(formName){ saveFun(formName){
const self = this; const self = this;
self.$refs[formName].validate((valid) => { self.$refs[formName].validate((valid) => {
if (valid) { if (valid) {
//提交表单
} else { } else {
return false; return false;
} }
......
// 待完工 // 待完工
var beCompleting={ var beCompleting={
template: ` template: `
<el-dialog :visible.sync="dialog.show" custom-class='order-detail animated slideInRight' @close="handleClose" :append-to-body="true" :show-close='true'> <el-dialog width="570px" :visible.sync="dialog.show" custom-class='order-detail animated slideInRight' @close="handleClose" :append-to-body="true" :show-close='true'>
<div slot='title' class="el-dialog__title"> <div slot='title' class="el-dialog__title">
<i class="iconfont icongongdan"></i> <i class="iconfont icongongdan"></i>
{{dialog.title}} {{dialog.title}}
</div> </div>
<el-tabs v-model="dialog.tab" type="card" @tab-click="handleClick"> <div class="edict-icon" v-if="dialog.tab=='1'">
<el-tab-pane label="详情" name="1" > <i class="el-icon-edit-outline" ></i>
<h2 class="line-left">派单信息</h2> <i class="el-icon-delete" ></i>
<div class='order-detail-tab'> </div>
<p> <el-tabs v-model="dialog.tab" type="card" >
用 户: <span>张女士 13711387865</span> <el-tab-pane label="详情" name="1" >
</p> <h2 class="line-left">派单信息</h2>
<p>地 址:<span>广东深圳福田深南大道招商银行大厦1101</span></p> <div class='order-detail-tab'>
<p>产 品:<span>格力 空调 KFR-35GW/NhEaB1W (安装1台)</span></p> <p>
<p>授权点:<span>唯修汇(张师傅 13644442222)</span></p> 用 户: <span>张女士 13711387865</span>
<p>描述:<span>请尽快安装请尽快安装请尽快安装请尽快安装请尽快安装请尽快安装请尽快安装请尽</span></p> </p>
</div> <p>地 址:<span>广东深圳福田深南大道招商银行大厦1101</span></p>
<h2 class="line-left">工单履历</h2> <p>产 品:<span>格力 空调 KFR-35GW/NhEaB1W (安装1台)</span></p>
<div> <p>授权点:<span>唯修汇(张师傅 13644442222)</span></p>
<div class="order-detail-steps" style=""> <p>描述:<span>请尽快安装请尽快安装请尽快安装请尽快安装请尽快安装请尽快安装请尽快安装请尽</span></p>
<el-steps direction="vertical" :active="1"> </div>
<el-step title="客服:结算确权 " description='03-13 18:30:02' icon='1'> <h2 class="line-left">工单履历</h2>
<i class="iconfont iconshixinyuanxing" slot="icon"></i> <div>
</el-step> <div class="order-detail-steps" style="">
<el-step title="张师傅:完工" description=' 03-13 18:30:02'> <el-steps direction="vertical" :active="1">
<i class="iconfont iconshixinyuanxing" slot="icon"></i></el-step> <el-step title="客服:结算确权 " description='03-13 18:30:02' icon='1'>
<el-step title="张师傅:改预约时间(03-13 10:00),备注:用户明天回 " description='03-13 18:30:02'> <i class="iconfont iconshixinyuanxing" slot="icon"></i>
<i class="iconfont iconshixinyuanxing" slot="icon"></i></el-step> </el-step>
</el-step> <el-step title="张师傅:完工" description=' 03-13 18:30:02'>
<el-step title="张师傅:改预约时间(03-12 11:00),备注:用户出差不在家,已经协调修改预约时间" description='03-13 18:30:02'> <i class="iconfont iconshixinyuanxing" slot="icon"></i></el-step>
<i class="iconfont iconshixinyuanxing" slot="icon"></i></el-step> <el-step title="张师傅:改预约时间(03-13 10:00),备注:用户明天回 " description='03-13 18:30:02'>
</el-step> <i class="iconfont iconshixinyuanxing" slot="icon"></i></el-step>
<el-step title="客服:结算确权" description='03-13 18:30:02'> </el-step>
<i class="iconfont iconshixinyuanxing" slot="icon"></i></el-step> <el-step title="张师傅:改预约时间(03-12 11:00),备注:用户出差不在家,已经协调修改预约时间" description='03-13 18:30:02'>
</el-step> <i class="iconfont iconshixinyuanxing" slot="icon"></i></el-step>
<el-step title="系统:派单给唯修汇 " description='03-13 18:30:02'> </el-step>
<i class="iconfont iconshixinyuanxing" slot="icon"></i></el-step> <el-step title="客服:结算确权" description='03-13 18:30:02'>
</el-step> <i class="iconfont iconshixinyuanxing" slot="icon"></i></el-step>
</el-steps> </el-step>
</div> <el-step title="系统:派单给唯修汇 " description='03-13 18:30:02'>
</div> <i class="iconfont iconshixinyuanxing" slot="icon"></i></el-step>
</el-tab-pane> </el-step>
</el-steps>
</div>
</div>
</el-tab-pane>
<el-tab-pane label="反馈" name="2"> <el-tab-pane label="反馈" name="2">
<div class="order-request-box"> <div class="order-request-box">
<div class="order-detail-response"> <div class="order-detail-response">
...@@ -89,41 +93,41 @@ var beCompleting={ ...@@ -89,41 +93,41 @@ var beCompleting={
</div> </div>
</div> </div>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</el-dialog>`, </el-dialog>`,
props: { props: {
//父组件调用时传进来的参数 //父组件调用时传进来的参数
modalData: Object modalData: Object
}, },
data(){ data(){
return{ return{
detail:{ },uploadApi:'', uploadApi:'',
resdata:{ resdata:{
inputValue:"", inputValue:"",
talks:[ talks:[
{ {
type:'1',value:'不制冷 用户报修麻烦处理', type:'1',value:'不制冷 用户报修麻烦处理',
}, },
{ {
type:'0',value:'用户不同意维修,想换机', type:'0',value:'用户不同意维修,想换机',
}, },
{ {
type:'2',value:'2019-5-16-09', type:'2',value:'2019-5-16-09',
}, },
{ {
type:'1',value:'新机已发:申通快递,5313865831164,请把机器寄回总部请把机器寄回总部请把机器寄回总部请把机器寄回总部请把机器寄回总', type:'1',value:'新机已发:申通快递,5313865831164,请把机器寄回总部请把机器寄回总部请把机器寄回总部请把机器寄回总部请把机器寄回总',
} }
] ]
}, },
message:{ }, message:{ },
dialog:{ dialog:{
show:true, show:true,
title:'', title:'',
tab:'1', tab:'1',
status:'' status:''
}, },
} }
}, },
created(){ created(){
this.dialog.title = '工单(GLDQ0019211237)--待完工'; this.dialog.title = '工单(GLDQ0019211237)--待完工';
...@@ -131,9 +135,6 @@ var beCompleting={ ...@@ -131,9 +135,6 @@ var beCompleting={
methods:{ methods:{
handleClose() { handleClose() {
this.$emit('close') this.$emit('close')
},
handleClick(){
}, },
/*********上传图片 start************/ /*********上传图片 start************/
handleAvatarSuccess1(res, file) { handleAvatarSuccess1(res, file) {
......
This diff is collapsed.
...@@ -8,7 +8,6 @@ var Deliver={ ...@@ -8,7 +8,6 @@ var Deliver={
<el-option v-for="item in form.options" :key="item.value" :label="item.label" :value="item.value"> <el-option v-for="item in form.options" :key="item.value" :label="item.label" :value="item.value">
</el-option> </el-option>
</el-select> </el-select>
<div class="bt-center"> <div class="bt-center">
<el-button class='background-blue text-white firstborder_blue' >确定</el-button> <el-button class='background-blue text-white firstborder_blue' >确定</el-button>
</div> </div>
...@@ -19,8 +18,6 @@ var Deliver={ ...@@ -19,8 +18,6 @@ var Deliver={
}, },
data(){ data(){
return{ return{
detail:{ },uploadApi:'',
dialog:{ dialog:{
show:true,title:'派单',tab:'1', show:true,title:'派单',tab:'1',
}, },
...@@ -30,7 +27,6 @@ var Deliver={ ...@@ -30,7 +27,6 @@ var Deliver={
} }
}, },
created(){ created(){
console.log(this.modalData)
}, },
methods:{ methods:{
handleClose() { handleClose() {
......
// 已完工
var hasDone={ var hasDone={
template: `<el-dialog :title="dialog.title" :visible.sync="dialog.show" custom-class='order-detail animated slideInRight' @close="handleClose" :append-to-body="true" :show-close='true'> template: `<el-dialog width="570px" :visible.sync="dialog.show" custom-class='order-detail animated slideInRight' @close="handleClose" :append-to-body="true" :show-close='true'>
<div slot='title' class="el-dialog__title">
<i class="iconfont icongongdan"></i>
{{dialog.title}}
</div>
<el-tabs v-model="dialog.tab" type="card" @tab-click="handleClick"> <el-tabs v-model="dialog.tab" type="card" @tab-click="handleClick">
<el-tab-pane label="详情" name="1" > <el-tab-pane label="详情" name="1" >
<h2 class="line-left">派单信息</h2> <h2 class="line-left">派单信息</h2>
...@@ -72,11 +77,10 @@ var hasDone={ ...@@ -72,11 +77,10 @@ var hasDone={
</div> </div>
<div class="order-detail-request"> <div class="order-detail-request">
<div class="plus" style=''> <div class="plus" style=''>
<el-upload title="点击选取或更换图片" :action="uploadApi" name="img" :show-file-list="false" :on-success="handleAvatarSuccess1" :before-upload="beforeAvatarUpload1" :on-error='uploaderror'> <el-upload title="点击选取或更换图片" :action="uploadApi" name="img" :show-file-list="false" :on-success="handleAvatarSuccess1" :before-upload="beforeAvatarUpload1" :on-error='uploaderror'>
<i class='el-icon-plus' ></i> <i class='el-icon-plus' ></i>
</el-upload>
</el-upload>
</div> </div>
<el-input class='order-input-area' v-model='resdata.inputValue'></el-input> <el-input class='order-input-area' v-model='resdata.inputValue'></el-input>
<el-button style="margin-left:10px">发送</el-button> <el-button style="margin-left:10px">发送</el-button>
...@@ -98,7 +102,6 @@ var hasDone={ ...@@ -98,7 +102,6 @@ var hasDone={
<el-col :span="4">1</el-col> <el-col :span="4">1</el-col>
<el-col :span="8">¥200</el-col> <el-col :span="8">¥200</el-col>
</el-row> </el-row>
</div> </div>
<h2 class="line-left">完工信息</h2> <h2 class="line-left">完工信息</h2>
<div class='order-detail-tab' style="line-height:2.5;border:none"> <div class='order-detail-tab' style="line-height:2.5;border:none">
...@@ -128,10 +131,10 @@ var hasDone={ ...@@ -128,10 +131,10 @@ var hasDone={
<i class="el-icon-arrow-left"></i> <i class="el-icon-arrow-left"></i>
<i class="el-icon-arrow-right"></i> <i class="el-icon-arrow-right"></i>
<div class="order-carousel-content"> <div class="order-carousel-content">
<img src="../static/images/man.jpg" alt="" width="120px" height="120px" class="one"> <img src="../static/images/man.jpg" alt="" width="100px" height="120px" class="one">
<img src="../static/images/man.jpg" alt="" width="120px" height="120px"> <img src="../static/images/man.jpg" alt="" width="100px" height="120px">
<img src="../static/images/man.jpg" alt="" width="120px" height="120px"> <img src="../static/images/man.jpg" alt="" width="100px" height="120px">
<img src="../static/images/man.jpg" alt="" width="120px" height="120px"> <img src="../static/images/man.jpg" alt="" width="100px" height="120px">
</div> </div>
</div> </div>
<p> <p>
...@@ -148,7 +151,7 @@ var hasDone={ ...@@ -148,7 +151,7 @@ var hasDone={
}, },
data(){ data(){
return{ return{
detail:{ },uploadApi:'', uploadApi:'',
resdata:{ resdata:{
inputValue:"", inputValue:"",
talks:[ talks:[
...@@ -177,10 +180,10 @@ var hasDone={ ...@@ -177,10 +180,10 @@ var hasDone={
} }
}, },
created(){ created(){
console.log(this.modalData)
this.dialog.title = '工单(GLDQ0019211237)--已完成' ;; this.dialog.title = '工单(GLDQ0019211237)--已完成' ;;
}, },
methods:{ methods:{
// 传递事件
handleClose() { handleClose() {
this.$emit('close') this.$emit('close')
}, },
......
// 打回
var VRefuse={ var VRefuse={
template: ` template: `
<el-dialog :title="dialog.title" width='444px' :visible.sync="dialog.show" custom-class='deliver-dialog' @close="handleClose" :append-to-body="true" :show-close='true'> <el-dialog :title="dialog.title" width='444px' :visible.sync="dialog.show" custom-class='deliver-dialog' @close="handleClose" :append-to-body="true" :show-close='true'>
...@@ -28,7 +29,6 @@ var VRefuse={ ...@@ -28,7 +29,6 @@ var VRefuse={
} }
}, },
created(){ created(){
console.log(this.modalData)
}, },
methods:{ methods:{
handleClose() { handleClose() {
......
//结算
var settlePrice={ var settlePrice={
template: ` template: `
<el-dialog :title="dialog.title" width='444px' :visible.sync="dialog.show" custom-class='deliver-dialog' @close="handleClose" :append-to-body="true" :show-close='true'> <el-dialog :title="dialog.title" width='444px' :visible.sync="dialog.show" custom-class='deliver-dialog' @close="handleClose" :append-to-body="true" :show-close='true'>
...@@ -14,8 +15,6 @@ var settlePrice={ ...@@ -14,8 +15,6 @@ var settlePrice={
<el-input v-model='form.remark'></el-input> <el-input v-model='form.remark'></el-input>
<div class="deliver-dialog-title">合计金额(元):</div> <div class="deliver-dialog-title">合计金额(元):</div>
<el-input v-model='form.total_price'></el-input> <el-input v-model='form.total_price'></el-input>
<div class="bt-center"> <div class="bt-center">
<el-button class='background-blue text-white' >确定结算</el-button> <el-button class='background-blue text-white' >确定结算</el-button>
</div> </div>
...@@ -37,7 +36,6 @@ var settlePrice={ ...@@ -37,7 +36,6 @@ var settlePrice={
} }
}, },
created(){ created(){
console.log(this.modalData)
}, },
methods:{ methods:{
handleClose() { handleClose() {
......
...@@ -56,6 +56,7 @@ ...@@ -56,6 +56,7 @@
background: #F1F3F9; background: #F1F3F9;
border: none; border: none;
height: 30px; height: 30px;
border-radius: 4px;
} }
.all-order .all-order-serch .seach-input { .all-order .all-order-serch .seach-input {
margin-right: 8px; margin-right: 8px;
...@@ -72,9 +73,15 @@ ...@@ -72,9 +73,15 @@
border-radius: 4px; border-radius: 4px;
margin-right: 8px; margin-right: 8px;
} }
.button-icon i { .button-icon i.iconloudou {
font-size: 22px;color: #5874D8; font-size: 22px;
vertical-align:middle; color: #5874D8;
vertical-align: sub;
}
.button-icon i.iconpaixu {
font-size: 20px;
color: #5874D8;
vertical-align: sub;
} }
.addbutton{float: right;} .addbutton{float: right;}
.all-orders-box{ .all-orders-box{
...@@ -94,13 +101,14 @@ ...@@ -94,13 +101,14 @@
} }
.all-order-box{ .all-order-box{
width: 100%; width: 100%;
height: 94px; height: 92px;
margin-top: 10px; margin-top: 10px;
box-shadow: 3px 0px 5px 0px rgba(43,67,153,0.2); box-shadow: 3px 0px 5px 0px rgba(43,67,153,0.2);
} }
.all-box-top{ .all-box-top{
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
font-size: 12px;
} }
.all-box-top .type1{ .all-box-top .type1{
font-size: 14px; font-size: 14px;
...@@ -174,7 +182,7 @@ ...@@ -174,7 +182,7 @@
line-height: 62px; line-height: 62px;
padding-right:20px; padding-right:20px;
cursor: pointer; cursor: pointer;
font-size:16px; font-size:14px;
font-family:PingFangSC-Regular; font-family:PingFangSC-Regular;
font-weight:400; font-weight:400;
} }
...@@ -192,7 +200,7 @@ ...@@ -192,7 +200,7 @@
} }
.order-detail{ .order-detail{
width: 720px; /*width: 720px;*/
height: 638px; height: 638px;
float: right; float: right;
} }
...@@ -276,9 +284,10 @@ ...@@ -276,9 +284,10 @@
height: 300px; height: 300px;
margin-top: 10px; margin-top: 10px;
padding-left: 20px; padding-left: 20px;
padding-right: 24px;
} }
.order-detail-steps .el-step.is-vertical .el-step__title{ .order-detail-steps .el-step.is-vertical .el-step__title{
font-size: 14px; font-size: 12px;
} }
.order-detail .order-request-box{ .order-detail .order-request-box{
position: relative; position: relative;
...@@ -304,7 +313,7 @@ ...@@ -304,7 +313,7 @@
font-size: 29px; font-size: 29px;
} }
.order-detail .order-detail-request .order-input-area .seach-input .el-input__inner,.order-detail .order-detail-request .order-input-area { .order-detail .order-detail-request .order-input-area .seach-input .el-input__inner,.order-detail .order-detail-request .order-input-area {
width: 540px; width: 396px;
margin-top: 6px; margin-top: 6px;
margin-left: 20px; margin-left: 20px;
} }
...@@ -318,6 +327,17 @@ ...@@ -318,6 +327,17 @@
height: 28px; height: 28px;
margin-right: 20px; margin-right: 20px;
} }
/*********************编辑start**************************/
.order-detail .edict-icon{
position: absolute;right: 20px;
top:60px;z-index: 3000;
}
.order-detail .edict-icon i{
font-size: 24px;
color: #5874D8;
cursor: pointer;
}
/**********************反馈start*************************/ /**********************反馈start*************************/
.order-detail .order-detail-response{ .order-detail .order-detail-response{
position: absolute; position: absolute;
...@@ -356,7 +376,7 @@ ...@@ -356,7 +376,7 @@
border-radius: 4px; border-radius: 4px;
position: relative; position: relative;
top: 0; top: 0;
right: 0; right: 5px;
font-size: 12px; font-size: 12px;
line-height: 1.5; line-height: 1.5;
} }
...@@ -387,7 +407,7 @@ ...@@ -387,7 +407,7 @@
border-radius: 4px; border-radius: 4px;
position: relative; position: relative;
top: 0; top: 0;
left: 0; left: 5px;
border: 1px solid #e2e2e2; border: 1px solid #e2e2e2;
font-size: 12px; font-size: 12px;
line-height: 1.5; line-height: 1.5;
...@@ -425,22 +445,22 @@ ...@@ -425,22 +445,22 @@
margin-bottom:15px; margin-bottom:15px;
} }
.order-detail .order-detail-response .timestep::before{ .order-detail .order-detail-response .timestep::before{
content: ''; content: '';
position: absolute; position: absolute;
width: 200px; width: 160px;
height: 1px; height: 1px;
left: 87px; left: 60px;
top: 8px; top: 8px;
background: #ececec; background: #ececec;
} }
.order-detail .order-detail-response .timestep::after{ .order-detail .order-detail-response .timestep::after{
content: ''; content: '';
position: absolute; position: absolute;
width: 200px; width: 160px;
height: 1px; height: 1px;
right: 87px; right: 60px;
top: 8px; top: 8px;
background: #ececec; background: #ececec;
} }
/************************确权start******************************/ /************************确权start******************************/
.el-carousel__item h3 { .el-carousel__item h3 {
...@@ -457,10 +477,11 @@ ...@@ -457,10 +477,11 @@
background-color: #d3dce6; background-color: #d3dce6;
} }
.order-carousel{ .order-carousel{
height: 135px; height: 135px;
margin: auto; margin: auto;
padding: 0 100px; position: relative;
position: relative; padding-left: 30px;
padding-right: 50px;
} }
.order-carousel-content{ .order-carousel-content{
/*width: 520px;*/ /*width: 520px;*/
...@@ -468,6 +489,7 @@ ...@@ -468,6 +489,7 @@
margin: auto; margin: auto;
height: 135px; height: 135px;
overflow: hidden; overflow: hidden;
text-align: center;
} }
.order-carousel i:nth-child(1){ .order-carousel i:nth-child(1){
position: absolute; position: absolute;
...@@ -716,8 +738,6 @@ ...@@ -716,8 +738,6 @@
text-align: center; text-align: center;
font-size: 18px; font-size: 18px;
background: #fff; background: #fff;
/* Center slide text vertically */
display: -webkit-box; display: -webkit-box;
display: -ms-flexbox; display: -ms-flexbox;
display: -webkit-flex; display: -webkit-flex;
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<link rel="stylesheet" href="./../static/css/main.css"> <link rel="stylesheet" href="./../static/css/main.css">
<link rel="stylesheet" href="./../static/css/animate.css"> <link rel="stylesheet" href="./../static/css/animate.css">
<link rel="stylesheet" href="./set.css"> <link rel="stylesheet" href="./set.css">
<link rel="stylesheet" href="https://at.alicdn.com/t/font_1195086_r8hwtw2voe.css"> <link rel="stylesheet" href="https://at.alicdn.com/t/font_1195086_uybvbn4h3b.css">
</head> </head>
<body> <body>
<div id="app"> <div id="app">
...@@ -30,10 +30,11 @@ ...@@ -30,10 +30,11 @@
</div> </div>
</body> </body>
<!-- 先引入 Vue --> <!-- 先引入 Vue -->
<script src="https://unpkg.com/vue/dist/vue.js"></script> <script src="./../static/js/vue.js"></script>
<script src="./../static/js/jquery.js"></script>
<!-- 引入组件库 --> <!-- 引入组件库 -->
<script src="https://unpkg.com/element-ui/lib/index.js"></script> <script src="https://unpkg.com/element-ui/lib/index.js"></script>
<script src="./../static/js/common.js"></script> <script src="./../static/js/common.js"></script>
<script src="./Server.js"></script> <script src="./Server.js"></script>
<script src="./Product.js"></script> <script src="./Product.js"></script>
<script src="./Protect.js"></script> <script src="./Protect.js"></script>
......
//产品维护
var Product={ var Product={
template: ` template: `
<div class="settle-right"> <div class="settle-right">
...@@ -7,9 +8,9 @@ var Product={ ...@@ -7,9 +8,9 @@ var Product={
<el-option :label="item.label" :value="item.value" :key='item.label' v-for='(item,index) in search.options1'></el-option> <el-option :label="item.label" :value="item.value" :key='item.label' v-for='(item,index) in search.options1'></el-option>
</el-select> </el-select>
<el-input class="seach-input" v-model='search.name' prefix-icon="el-icon-search" placeholder='输入规格,型号名查询' size="mini"></el-input> <el-input class="seach-input" v-model='search.name' prefix-icon="el-icon-search" placeholder='输入规格,型号名查询' size="mini"></el-input>
<el-button type='primary' class='button-color' size="mini">搜索</el-button> <el-button type='primary' class='button-color firstborder_blue' size="mini">搜索</el-button>
<el-button type='primary' plain class='firstbackgroud_blue addbutton' @click="AddCardfun('creat')" size="mini">新建品牌</el-button> <el-button type='primary' plain class='firstbackgroud_blue addbutton ' @click="AddCardfun('creat')" size="mini">新建品牌</el-button>
<el-button type='primary' class='firstbackgroud_blue addbutton' @click='creatProduct()' size="mini">新建产品</el-button> <el-button type='primary' class='firstbackgroud_blue addbutton firstborder_blue' @click='creatProduct()' size="mini">新建产品</el-button>
</div> </div>
<div class="settle-content"> <div class="settle-content">
<table class="table-header"> <table class="table-header">
...@@ -34,21 +35,28 @@ var Product={ ...@@ -34,21 +35,28 @@ var Product={
</table> </table>
<table class="first-table"> <table class="first-table">
<tr v-for='(item,index) in tableData' :key='index'> <tr v-for='(item,index) in tableData' :key='index'>
<td style="width:15%"><div class="text_center cursor" @click='edictType(item)'>{{item.name}}</div></td> <td style="width:15%">
<div class="text_center cursor" @click='edictType(item)'>
<img src="../static/images/man.jpg" width="78px" height="78px"></img>
<div><el-button class="text_underline" type='text'>{{item.name}}</el-button></div>
</div>
</td>
<td style="width:85%;"> <td style="width:85%;">
<table class="second-table"> <table class="second-table">
<tr v-for='(items,indexs) in item.type' :key='indexs'> <tr v-for='(items,indexs) in item.type' :key='indexs'>
<td style="width:25%;"> <td style="width:25%;">
<div class="text_center cursor" @click='edictCate(item,items)'>{{items.cate}}</div> <div class="text_center cursor text_underline" @click='edictCate(item,items)'>{{items.cate}}</div>
</td> </td>
<td style="width:75%; "> <td style="width:75%; ">
<table class="third-table" > <table class="third-table" >
<tr v-for='(child,key) in items.type' :key='key'> <tr v-for='(child,key) in items.type' :key='key'>
<td style="width:70%" class='third-table-center'> <td style="width:70%" class='third-table-center'>
<div class="text_center"><el-button type='text' @click='edictModel(items,child)'>{{child.type}}</el-button></div> <div class="text_center">
<el-button class="firsttext_font text_underline" type='text' @click='edictModel(items,child)'>{{child.type}}</el-button>
</div>
</td> </td>
<td style="width:30%" @click="AddCardfun('edict')"> <td style="width:30%" @click="AddCardfun('edict')">
<div class="text_center"><div class="text_center">{{child.name}}</div></div> <div class="text_center"><div class="text_center firsttext_font text_underline">{{child.name}}</div></div>
</td> </td>
</tr> </tr>
...@@ -68,7 +76,7 @@ var Product={ ...@@ -68,7 +76,7 @@ var Product={
return{ return{
modal:null,modalData:[], modal:null,modalData:[],
search:{ search:{
type:'',status:'',options1:[],options2:[],name:'' type:'',options1:[],options2:[],name:''
}, },
table:{ table:{
current_page:1,page_count:7,total:50, current_page:1,page_count:7,total:50,
...@@ -92,7 +100,6 @@ var Product={ ...@@ -92,7 +100,6 @@ var Product={
type:'KFR-25GW/NFW+2', type:'KFR-25GW/NFW+2',
name:'海尔' name:'海尔'
}, },
] ]
}, },
{ {
...@@ -156,53 +163,41 @@ var Product={ ...@@ -156,53 +163,41 @@ var Product={
} }
] ]
}, },
], ],
chooseData:[] chooseData:[]
} }
},
wacth:{
}, },
methods:{ methods:{
opendialog(row){ //新增产品
if(row.status==1){
this.modalData = row;
this.modal = SettleDetail;
}else if(row.status==3){
this.modalData = row;
this.modal = PayDetail;
}else if(row.status==2){
this.modalData = row;
this.modal = Pay;
}
},
closeChild(){
this.modal = null;
},
creatProduct(){ creatProduct(){
this.modalData = {}; this.modalData = {};
this.modal = AddProduct; this.modal = AddProduct;
}, },
//新增品牌
AddCardfun(type){ AddCardfun(type){
this.modalData = {type:type}; this.modalData = {type:type};
this.modal = AddCard; this.modal = AddCard;
}, },
//编辑品类
edictType(item){ edictType(item){
this.modalData = {type:'edict',id:item.id}; this.modalData = {type:'edict',id:item.id};
this.modal = AddType; this.modal = AddType;
}, },
//编辑规格
edictCate(item,items){ edictCate(item,items){
this.modalData = {type:'edict',id:items.id,cate:items.cate,name:item.name}; this.modalData = {type:'edict',id:items.id,cate:items.cate,name:item.name};
this.modal = AddCate; this.modal = AddCate;
}, },
//编辑型号
edictModel(item,items){ edictModel(item,items){
this.modalData = {type:'edict',id:items.id,name:item.cate,cate:items.type,card:items.name}; this.modalData = {type:'edict',id:items.id,name:item.cate,cate:items.type,card:items.name};
console.log(this.modalData,items) console.log(this.modalData,items)
this.modal = AddModel; this.modal = AddModel;
} },
//关闭组件
closeChild(){
this.modal = null;
},
} }
} }
......
// 保内结算
var Protect ={ var Protect ={
template: ` template: `
<div class="settle-right"> <div class="settle-right">
...@@ -8,8 +9,8 @@ var Protect ={ ...@@ -8,8 +9,8 @@ var Protect ={
<el-select class="seach-select" v-model="search.status" @change='' placeholder="选择类型" size="mini"> <el-select class="seach-select" v-model="search.status" @change='' placeholder="选择类型" size="mini">
<el-option :label="item.label" :value="item.value" :key='item.label' v-for='(item,index) in search.options2'></el-option> <el-option :label="item.label" :value="item.value" :key='item.label' v-for='(item,index) in search.options2'></el-option>
</el-select> </el-select>
<el-button type='primary' class='firstbackgroud_blue' size="mini">搜索</el-button> <el-button type='primary' class='firstbackgroud_blue firstborder_blue' size="mini">搜索</el-button>
<el-button type='primary' class='firstbackgroud_blue addbutton' @click="addProtect()" size="mini">新建</el-button> <el-button type='primary' class='firstbackgroud_blue addbutton firstborder_blue' @click="addProtect()" size="mini">新建</el-button>
</div> </div>
<div class="settle-content"> <div class="settle-content">
<table class="table-header"> <table class="table-header">
...@@ -23,8 +24,8 @@ var Protect ={ ...@@ -23,8 +24,8 @@ var Protect ={
<table > <table >
<tr> <tr>
<th style="width:20%"> <div class="text_center">服务分类</div></th> <th style="width:20%"> <div class="text_center">服务分类</div></th>
<th style="width:40%" class='third-table-center'><div class="text_center">服务措施</div></th> <th style="width:60%" class='third-table-center'><div class="text_center">服务措施</div></th>
<th style="width:30%" class='third-table-center'><div class="text_center">金额</div></th> <th style="width:10%" class='third-table-center'><div class="text_center">金额</div></th>
<th style="width:10%"><div class="text_center">操作</div></th> <th style="width:10%"><div class="text_center">操作</div></th>
</tr> </tr>
</table> </table>
...@@ -36,7 +37,10 @@ var Protect ={ ...@@ -36,7 +37,10 @@ var Protect ={
</table> </table>
<table class="first-table"> <table class="first-table">
<tr v-for='(item,index) in tableData' :key='index'> <tr v-for='(item,index) in tableData' :key='index'>
<td style="width:15%"><div class="text_center">{{item.name}}</div></td> <td style="width:15%" class="text_center ">
<img src="../static/images/man.jpg" width="78px" height="78px"></img>
<div><el-button type='text'>{{item.name}}</el-button></div>
</td>
<td style="width:85%;"> <td style="width:85%;">
<table class="second-table"> <table class="second-table">
<tr v-for='(items,indexs) in item.type' :key='indexs'> <tr v-for='(items,indexs) in item.type' :key='indexs'>
...@@ -49,11 +53,11 @@ var Protect ={ ...@@ -49,11 +53,11 @@ var Protect ={
<td style="width:20%"> <td style="width:20%">
<div class="text_center">{{child.name}}</div> <div class="text_center">{{child.name}}</div>
</td> </td>
<td style="width:0%" class='third-table-center'> <td style="width:60%" class='third-table-center'>
<div class="text_center">{{child.cate}}</div> <div class="text_center">{{child.cate}}</div>
</td> </td>
<td style="width:30%" class='third-table-center'> <td style="width:10%" class='third-table-center'>
<div class="text_center">¥{{child.price}}</div> <div class="text_right" style="margin-right:5px">¥{{child.price}}</div>
</td> </td>
<td style="width:10%"> <td style="width:10%">
<div class="text_center"><el-button type='text' @click="edictProtect()">操作</el-button></div> <div class="text_center"><el-button type='text' @click="edictProtect()">操作</el-button></div>
...@@ -76,10 +80,7 @@ var Protect ={ ...@@ -76,10 +80,7 @@ var Protect ={
return{ return{
modal:null,modalData:[], modal:null,modalData:[],
search:{ search:{
type:'',status:'',options1:[],options2:[],name:'' type:'',options1:[],options2:[],name:''
},
table:{
current_page:1,page_count:7,total:50,
}, },
tableData:[ tableData:[
{ {
...@@ -98,7 +99,6 @@ var Protect ={ ...@@ -98,7 +99,6 @@ var Protect ={
cate:'定频1.5p',price:'8' cate:'定频1.5p',price:'8'
}, },
] ]
}, },
{ {
...@@ -160,53 +160,22 @@ var Protect ={ ...@@ -160,53 +160,22 @@ var Protect ={
], ],
chooseData:[] chooseData:[]
} }
},
wacth:{
}, },
methods:{ methods:{
handleCurrentChange(page) { //新增保内结算
},
checkData(row,event, column){
console.log(row.status)
},
opendialog(row){
if(row.status==1){
this.modalData = row;
this.modal = SettleDetail;
}else if(row.status==3){
this.modalData = row;
this.modal = PayDetail;
}else if(row.status==2){
this.modalData = row;
this.modal = Pay;
}
},
closeChild(){
this.modal = null;
},
handleSelectionChange(val){
this.chooseData = val;
console.log(val)
},
settleFun(){
if(this.chooseData.length>0){
this.modalData = this.chooseData;
this.modal = Settle
}else{
this.$message({ message: '请选择数据', type: 'warning' });
}
},
addProtect(){ addProtect(){
this.modalData = {type:'creat'}; this.modalData = {type:'creat'};
this.modal = EdictProtect; this.modal = EdictProtect;
}, },
//编辑保内结算
edictProtect(){ edictProtect(){
this.modalData = {type:'edict'}; this.modalData = {type:'edict'};
this.modal = EdictProtect; this.modal = EdictProtect;
} },
// 关闭组件
closeChild(){
this.modal = null;
},
} }
} }
// 服务维护
var Server={ var Server={
template: ` template: `
<div class="settle-right"> <div class="settle-right">
...@@ -8,8 +9,8 @@ var Server={ ...@@ -8,8 +9,8 @@ var Server={
<el-select class="seach-select" v-model="search.status" @change='' placeholder="选择状态" size="mini"> <el-select class="seach-select" v-model="search.status" @change='' placeholder="选择状态" size="mini">
<el-option :label="item.label" :value="item.value" :key='item.label' v-for='(item,index) in search.options2'></el-option> <el-option :label="item.label" :value="item.value" :key='item.label' v-for='(item,index) in search.options2'></el-option>
</el-select> </el-select>
<el-button type='primary' class='firstbackgroud_blue' size="mini">搜索</el-button> <el-button type='primary' class='firstbackgroud_blue firstborder_blue' size="mini">搜索</el-button>
<el-button type='primary' class='firstbackgroud_blue addbutton' @click='AddServerFun()' size="mini">新建服务</el-button> <el-button type='primary' class='firstbackgroud_blue addbutton firstborder_blue' @click='AddServerFun()' size="mini">新建服务</el-button>
</div> </div>
<div class="settle-content"> <div class="settle-content">
<table class="table-header"> <table class="table-header">
...@@ -35,8 +36,9 @@ var Server={ ...@@ -35,8 +36,9 @@ var Server={
<table class="first-table"> <table class="first-table">
<tr v-for='(item,index) in tableData' :key='index'> <tr v-for='(item,index) in tableData' :key='index'>
<td style="width:15%"> <td style="width:15%">
<div class="text_center"> <div class="text_center cursor" @click='EdictName()'>
<el-button type='text' style='color:#333' @click='EdictName()'>{{item.name}}</el-button> <img src="../static/images/man.jpg" width="78px" height="78px"></img>
<div><el-button class="text_underline" type='text'>{{item.name}}</el-button></div>
</div> </div>
</td> </td>
<td style="width:85%;"> <td style="width:85%;">
...@@ -53,7 +55,7 @@ var Server={ ...@@ -53,7 +55,7 @@ var Server={
</td> </td>
<td style="width:70%" class='third-table-center'> <td style="width:70%" class='third-table-center'>
<div class="text_center"> <div class="text_center">
<el-button type='text' style='color:#333'>{{child.cate}}</el-button> <el-button type='text' style='color:#333;cursor:default'>{{child.cate}}</el-button>
</div> </div>
</td> </td>
</tr> </tr>
...@@ -71,10 +73,7 @@ var Server={ ...@@ -71,10 +73,7 @@ var Server={
return{ return{
modal:null,modalData:[], modal:null,modalData:[],
search:{ search:{
type:'',status:'',options1:[],options2:[],name:'' type:'',options1:[],options2:[],name:''
},
table:{
current_page:1,page_count:7,total:50,
}, },
tableData:[ tableData:[
{ {
...@@ -93,7 +92,6 @@ var Server={ ...@@ -93,7 +92,6 @@ var Server={
cate:'定频1.5p',price:'8' cate:'定频1.5p',price:'8'
}, },
] ]
}, },
{ {
...@@ -150,59 +148,26 @@ var Server={ ...@@ -150,59 +148,26 @@ var Server={
} }
] ]
}, },
], ],
chooseData:[] chooseData:[]
} }
},
wacth:{
}, },
methods:{ methods:{
handleCurrentChange(page) { //新增服务
},
checkData(row,event, column){
console.log(row.status)
},
opendialog(row){
if(row.status==1){
this.modalData = row;
this.modal = SettleDetail;
}else if(row.status==3){
this.modalData = row;
this.modal = PayDetail;
}else if(row.status==2){
this.modalData = row;
this.modal = Pay;
}
},
closeChild(){
this.modal = null;
},
handleSelectionChange(val){
this.chooseData = val;
console.log(val)
},
settleFun(){
if(this.chooseData.length>0){
this.modalData = this.chooseData;
this.modal = Settle
}else{
this.$message({ message: '请选择数据', type: 'warning' });
}
},
AddServerFun(){ AddServerFun(){
this.modalData = {type:'creat',name:'空调'}; this.modalData = {type:'creat',name:'空调'};
this.modal = AddServer; this.modal = AddServer;
}, },
//编辑品牌
EdictName(){ EdictName(){
this.modalData = {type:'edict',name:''}; this.modalData = {type:'edict',name:''};
this.modal = EdictName; this.modal = EdictName;
} },
//关闭组件
closeChild(){
this.modal = null;
},
} }
} }
...@@ -4,27 +4,24 @@ var AddCard={ ...@@ -4,27 +4,24 @@ var AddCard={
<div class="dialog-content"> <div class="dialog-content">
<div class="deliver-dialog-title">品牌名称:</div> <div class="deliver-dialog-title">品牌名称:</div>
<el-input v-model="form.name"></el-input> <el-input v-model="form.name"></el-input>
<div class="bt-center"> <div class="bt-center">
<el-button type="primary" class='firstbackgroud_blue text-white firstborder_blue' >保存</el-button> <el-button type="primary" class='firstbackgroud_blue text-white firstborder_blue' >保存</el-button>
<el-button type="danger" class='firstbackgroud_red text-white firstborder_red' v-if="isEdcit">删除</el-button> <el-button type="danger" class='firstbackgroud_red text-white firstborder_red' v-if="isEdcit">删除</el-button>
</div> </div>
</div> </div>
</el-dialog>`, </el-dialog>`,
props: { props: {
//父组件调用时传进来的参数 //父组件调用时传进来的参数
modalData: Object modalData: Object
}, },
data(){ data(){
return{ return{
uploadApi:'',isEdcit:false, isEdcit:false,
dialog:{ dialog:{
show:true,title:'新建品牌',type:1 show:true,title:'新建品牌',type:1
}, },
form:{ form:{
name:'', name:'',
cate:''
} }
} }
}, },
......
...@@ -7,7 +7,6 @@ var AddCate={ ...@@ -7,7 +7,6 @@ var AddCate={
<el-input v-model="form.name"></el-input> <el-input v-model="form.name"></el-input>
<div class="deliver-dialog-title">产品规格:</div> <div class="deliver-dialog-title">产品规格:</div>
<el-input v-model="form.cate"></el-input> <el-input v-model="form.cate"></el-input>
<div class="bt-center"> <div class="bt-center">
<el-button type="primary" class='firstbackgroud_blue text-white firstborder_blue' >保存</el-button> <el-button type="primary" class='firstbackgroud_blue text-white firstborder_blue' >保存</el-button>
<el-button type="danger" class='firstbackgroud_red text-white firstborder_red' v-if="!isCreat">删除</el-button> <el-button type="danger" class='firstbackgroud_red text-white firstborder_red' v-if="!isCreat">删除</el-button>
...@@ -20,7 +19,7 @@ var AddCate={ ...@@ -20,7 +19,7 @@ var AddCate={
}, },
data(){ data(){
return{ return{
uploadApi:'',isCreat:true, isCreat:true,
dialog:{ dialog:{
show:true,title:'产品规格',type:1 show:true,title:'产品规格',type:1
}, },
...@@ -44,7 +43,6 @@ var AddCate={ ...@@ -44,7 +43,6 @@ var AddCate={
methods:{ methods:{
getinfo(){ getinfo(){
this.form.cate = this.modalData.cate; this.form.cate = this.modalData.cate;
}, },
handleClose() { handleClose() {
this.$emit('close') this.$emit('close')
......
...@@ -2,9 +2,6 @@ ...@@ -2,9 +2,6 @@
var AddModel={ var AddModel={
template: ` template: `
<el-dialog width="444px" :title="dialog.title" custom-class='addcate' :visible.sync="dialog.show" @close="handleClose" append-to-body> <el-dialog width="444px" :title="dialog.title" custom-class='addcate' :visible.sync="dialog.show" @close="handleClose" append-to-body>
<div class="dialog-content"> <div class="dialog-content">
<div class="deliver-dialog-title">规格分类:</div> <div class="deliver-dialog-title">规格分类:</div>
<el-input v-model="form.name"></el-input> <el-input v-model="form.name"></el-input>
...@@ -15,7 +12,6 @@ var AddModel={ ...@@ -15,7 +12,6 @@ var AddModel={
</el-select> </el-select>
<div class="deliver-dialog-title">输入型号:</div> <div class="deliver-dialog-title">输入型号:</div>
<el-input v-model="form.model" type="textarea" placeholder="型号名称(多个用逗号隔开)"></el-input> <el-input v-model="form.model" type="textarea" placeholder="型号名称(多个用逗号隔开)"></el-input>
<div class="bt-center"> <div class="bt-center">
<el-button type="primary" class='firstbackgroud_blue text-white firstborder_blue' >保存</el-button> <el-button type="primary" class='firstbackgroud_blue text-white firstborder_blue' >保存</el-button>
<el-button type="danger" class='firstbackgroud_red text-white firstborder_red' v-if="!isCreat">删除</el-button> <el-button type="danger" class='firstbackgroud_red text-white firstborder_red' v-if="!isCreat">删除</el-button>
...@@ -28,7 +24,7 @@ var AddModel={ ...@@ -28,7 +24,7 @@ var AddModel={
}, },
data(){ data(){
return{ return{
uploadApi:'',isCreat:true, isCreat:true,
dialog:{ dialog:{
show:true,title:'产品型号',type:1 show:true,title:'产品型号',type:1
}, },
...@@ -40,7 +36,6 @@ var AddModel={ ...@@ -40,7 +36,6 @@ var AddModel={
} }
}, },
created(){ created(){
this.form.name = this.modalData.name; this.form.name = this.modalData.name;
if(this.modalData.type=='creat'){ if(this.modalData.type=='creat'){
this.dialog.title = '新增型号'; this.dialog.title = '新增型号';
......
// 新增产品
var AddProduct={ var AddProduct={
template: ` template: `
<el-dialog :title="dialog.title" :visible.sync="dialog.show" custom-class='order-detail' @close="handleClose" :append-to-body="true" :show-close='true'> <el-dialog width="570px" :visible.sync="dialog.show" custom-class='order-detail' @close="handleClose" :append-to-body="true" :show-close='true'>
<el-tabs v-model="dialog.tab" type="card" @tab-click="handleClick" > <div slot='title' class="el-dialog__title">
<i class="iconfont iconrenzhengdunpaianquanbaozhangzhibao-xianxing"></i>
{{dialog.title}}
</div>
<el-tabs v-model="dialog.tab" type="card" >
<el-tab-pane label="品类" name="1"> <el-tab-pane label="品类" name="1">
<div class='order-detail-tab' style="padding:20px;line-height:3"> <div class='order-detail-tab' style="padding:20px;line-height:3">
<el-radio v-model="choose_type" v-for='(item,index) in products' :key='index' :label="item.id" @change='clickType(item)' border size="medium">{{item.name}}</el-radio> <el-radio v-model="choose_type" v-for='(item,index) in products' :key='index' :label="item.id" @change='clickType(item)' border size="medium">{{item.name}}</el-radio>
...@@ -14,7 +19,7 @@ var AddProduct={ ...@@ -14,7 +19,7 @@ var AddProduct={
<el-tab-pane :label="'【' +choose_typeName+'】下的产品规格'" > <el-tab-pane :label="'【' +choose_typeName+'】下的产品规格'" >
<div class='order-detail-tab' style="padding:20px;line-height:3;"> <div class='order-detail-tab' style="padding:20px;line-height:3;">
<el-radio v-model="choose_cate" v-for='(item,index) in cates' :key='index' :label="item.id" @change='clickCate(item)' border size="medium">{{item.name}}</el-radio> <el-radio v-model="choose_cate" v-for='(item,index) in cates' :key='index' :label="item.id" @change='clickCate(item)' border size="medium">{{item.name}}</el-radio>
<span class='tag cursor' @click='addType()'> <span class='tag cursor' @click='addCate()'>
<i class='el-icon-plus'></i> <i class='el-icon-plus'></i>
</span> </span>
...@@ -44,7 +49,6 @@ var AddProduct={ ...@@ -44,7 +49,6 @@ var AddProduct={
}, },
data(){ data(){
return{ return{
detail:{ },
modal:null,innerData:{}, modal:null,innerData:{},
products:[ products:[
{id:1,name:'空调'}, {id:1,name:'空调'},
...@@ -69,31 +73,29 @@ var AddProduct={ ...@@ -69,31 +73,29 @@ var AddProduct={
dialog:{ dialog:{
show:true,title:'新增产品信息',tab:'1', show:true,title:'新增产品信息',tab:'1',
}, },
innerDialog1:{
show:false,title:'',type:1
}
} }
}, },
methods:{ methods:{
//传递关闭事件
handleClose() { handleClose() {
this.$emit('close') this.$emit('close')
}, },
handleClick(){ //新增品类
},
addType(){ addType(){
this.innerData = {type:'creat'}; this.innerData = {type:'creat'};
this.modal = AddType; this.modal = AddType;
}, },
//新增规格
addCate(){ addCate(){
this.innerData = {type:'creat',name:this.choose_typeName}; this.innerData = {type:'creat',name:this.choose_typeName};
this.modal = AddCate; this.modal = AddCate;
}, },
//新增型号
addModel(){ addModel(){
this.innerData = {title:'新增类型',name:this.choose_cateName,show:true,type:'creat'}; this.innerData = {title:'新增类型',name:this.choose_cateName,show:true,type:'creat'};
this.modal = AddModel; this.modal = AddModel;
}, },
//关闭子组件
closeChild(){ closeChild(){
this.modal = null; this.modal = null;
}, },
......
...@@ -10,8 +10,6 @@ var AddType={ ...@@ -10,8 +10,6 @@ var AddType={
<img v-if="form.img" :src="form.img" class="addtype"> <img v-if="form.img" :src="form.img" class="addtype">
<i v-else class="el-icon-plus addtype-uploader-icon"></i> <i v-else class="el-icon-plus addtype-uploader-icon"></i>
</el-upload> </el-upload>
<div class="bt-center"> <div class="bt-center">
<el-button type="primary" class='firstbackgroud_blue text-white firstborder_blue' >保存</el-button> <el-button type="primary" class='firstbackgroud_blue text-white firstborder_blue' >保存</el-button>
<el-button type="danger" class='firstbackgroud_red text-white firstborder_red' v-if="!isCreat">删除</el-button> <el-button type="danger" class='firstbackgroud_red text-white firstborder_red' v-if="!isCreat">删除</el-button>
...@@ -46,6 +44,7 @@ var AddType={ ...@@ -46,6 +44,7 @@ var AddType={
}, },
methods:{ methods:{
getinfo(){ getinfo(){
//modalData获取数据
this.form.name = '空调'; this.form.name = '空调';
}, },
handleClose() { handleClose() {
......
//新增编辑保内结算
var EdictProtect={ var EdictProtect={
template: ` template: `
<el-dialog width="444px" :title="dialog.title" custom-class='addcate add-protect ' :visible.sync="dialog.show" @close="handleClose" append-to-body> <el-dialog width="444px" :title="dialog.title" custom-class='addcate add-protect ' :visible.sync="dialog.show" @close="handleClose" append-to-body>
<div class="dialog-content"> <div class="dialog-content">
<el-form ref="form" :model="form" label-width="100px"> <el-form ref="form" :model="form" label-width="82px">
<el-form-item label="品类名称:"> <el-form-item label="品类名称:">
<el-select v-model="form.name" placeholder="选择品类" style="width:100%"> <el-select v-model="form.name" placeholder="选择品类" style="width:100%">
<el-option :label="item.label" :value="item.value" :key="item.label" v-for="(item,index) in options1"></el-option> <el-option :label="item.label" :value="item.value" :key="item.label" v-for="(item,index) in options1"></el-option>
...@@ -22,16 +23,13 @@ var EdictProtect={ ...@@ -22,16 +23,13 @@ var EdictProtect={
<el-select v-model="form.cate" placeholder="选择规格(多选)" style="width:100%" @change="chooseFun"> <el-select v-model="form.cate" placeholder="选择规格(多选)" style="width:100%" @change="chooseFun">
<el-option :label="item.label" :value="item" :key="item.label" v-for="(item,index) in options4"></el-option> <el-option :label="item.label" :value="item" :key="item.label" v-for="(item,index) in options4"></el-option>
</el-select> </el-select>
<div style="max-height:122px;overflow-y:auto">
<span class="tag" v-for="(item,index) in chooseList" :key="index">
{{item.label}}
<i @click="deleteFun(index)" class='el-icon-close addoperate-icon'></i>
</span>
</div>
</el-form-item>
<el-form-item label="已 选:" class="pre_space">
<el-input placeholder='请输入金额'></el-input>
</el-form-item> </el-form-item>
<div style="max-height:122px;overflow-y:auto;margin-bottom:8px">
<span class="tag" v-for="(item,index) in chooseList" :key="index">
{{item.label}}
<i @click="deleteFun(index)" class='el-icon-close addoperate-icon'></i>
</span>
</div>
<el-form-item label="保内结算:"> <el-form-item label="保内结算:">
<el-input v-model="form.price" placeholder='请输入金额'></el-input> <el-input v-model="form.price" placeholder='请输入金额'></el-input>
</el-form-item> </el-form-item>
...@@ -50,9 +48,9 @@ var EdictProtect={ ...@@ -50,9 +48,9 @@ var EdictProtect={
}, },
data(){ data(){
return{ return{
uploadApi:'',isCreat:true, isCreat:true,
dialog:{ dialog:{
show:true,title:'产品品类',type:1 show:true,title:'',type:1
}, },
form:{ form:{
name:'', name:'',
...@@ -85,12 +83,12 @@ var EdictProtect={ ...@@ -85,12 +83,12 @@ var EdictProtect={
}, },
methods:{ methods:{
getinfo(){ getinfo(){
//modalData获取数据
}, },
handleClose() { handleClose() {
this.$emit('close') this.$emit('close')
}, },
chooseFun(value){ chooseFun(value){
console.log(value,this.chooseList)
this.chooseList.push(value) this.chooseList.push(value)
}, },
deleteFun(index){ deleteFun(index){
......
// 新增服务
var AddServer={ var AddServer={
template: ` template: `
<el-dialog :title="dialog.title" :visible.sync="dialog.show" custom-class='order-detail add-server animated slideInRight' @close="handleClose" :append-to-body="true" :show-close='true'> <el-dialog width="570px" :visible.sync="dialog.show" custom-class='order-detail add-server animated slideInRight' @close="handleClose" :append-to-body="true" :show-close='true'>
<div slot='title' class="el-dialog__title">
<i class="iconfont iconrenzhengdunpaianquanbaozhangzhibao-xianxing"></i>
{{dialog.title}}
</div>
<h2 style="margin-bottom:15px">品类名称:{{modalData.name}}</h2> <h2 style="margin-bottom:15px">品类名称:{{modalData.name}}</h2>
<el-tabs v-model="dialog.tab" type="card" @tab-click="handleClick"> <el-tabs v-model="dialog.tab" type="card" >
<el-tab-pane label="服务类型" name="1"> <el-tab-pane label="服务类型" name="1">
<div class='order-detail-tab' style="padding:10px 20px;line-height:3"> <div class='order-detail-tab' style="padding:10px 20px;line-height:3">
<el-radio v-model="choose_type" v-for='(item,index) in products' :key='index' :label="item.id" @change='clickType(item)' border size="medium">{{item.name}}</el-radio> <el-radio v-model="choose_type" v-for='(item,index) in products' :key='index' :label="item.id" @change='clickType(item)' border size="medium">{{item.name}}</el-radio>
...@@ -60,9 +65,8 @@ var AddServer={ ...@@ -60,9 +65,8 @@ var AddServer={
}, },
data(){ data(){
return{ return{
detail:{ },isCreat:true, isCreat:true,
input_first:'',input_second:'', input_first:'',input_second:'',input_third:'',
input_third:'',
modal:null,innerData:{}, modal:null,innerData:{},
products:[ products:[
{id:1,name:'安装'}, {id:1,name:'安装'},
...@@ -81,15 +85,11 @@ var AddServer={ ...@@ -81,15 +85,11 @@ var AddServer={
models:[ models:[
{id:1,name:'咨询'}, {id:1,name:'咨询'},
{id:2,name:'维修'}, {id:2,name:'维修'},
], ],
choose_model:'', choose_model:'',
dialog:{ dialog:{
show:true,title:'新增产品信息',tab:'1', show:true,title:'新增产品信息',tab:'1',
}, },
innerDialog1:{
show:false,title:'',type:1
}
} }
}, },
...@@ -104,31 +104,31 @@ var AddServer={ ...@@ -104,31 +104,31 @@ var AddServer={
} }
}, },
methods:{ methods:{
//关闭组件
handleClose() { handleClose() {
this.$emit('close') this.$emit('close')
}, },
handleClick(){ //服务类型
},
addFirst(){ addFirst(){
if(this.input_first.length>0){ if(this.input_first.length>0){
this.products.push({id:this.products.length+1,name:this.input_first}); this.products.push({id:this.products.length+1,name:this.input_first});
this.input_first = ''; this.input_first = '';
} }
}, },
// 服务分类
addSecond(){ addSecond(){
if(this.input_second.length>0){ if(this.input_second.length>0){
this.cates.push({id:this.products.length+1,name:this.input_second}); this.cates.push({id:this.products.length+1,name:this.input_second});
this.input_second = ''; this.input_second = '';
} }
}, },
// 服务措施
addThird(){ addThird(){
if(this.input_third.length>0){ if(this.input_third.length>0){
this.models.push({id:this.models.length+1,name:this.input_third}); this.models.push({id:this.models.length+1,name:this.input_third});
this.input_third = ''; this.input_third = '';
} }
}, },
closeChild(){ closeChild(){
this.modal = null; this.modal = null;
}, },
......
// 编辑品类
var EdictName={ var EdictName={
template: ` template: `
<el-dialog width='444px' :title="dialog.title" custom-class='addcate' :visible.sync="dialog.show" @close="handleClose" append-to-body> <el-dialog width='444px' :title="dialog.title" custom-class='addcate' :visible.sync="dialog.show" @close="handleClose" append-to-body>
...@@ -17,7 +18,6 @@ var EdictName={ ...@@ -17,7 +18,6 @@ var EdictName={
}, },
data(){ data(){
return{ return{
uploadApi:'',
dialog:{ dialog:{
show:true,title:'编辑',type:1 show:true,title:'编辑',type:1
}, },
...@@ -27,10 +27,7 @@ var EdictName={ ...@@ -27,10 +27,7 @@ var EdictName={
} }
}, },
created(){ created(){
// this.dialog.title = this.modalData.title; // console.log(this.modalData)
// this.form.name = this.modalData.name;
// this.dialog.show = this.modalData.show;
}, },
methods:{ methods:{
handleClose() { handleClose() {
......
...@@ -91,6 +91,7 @@ ...@@ -91,6 +91,7 @@
background: #F1F3F9; background: #F1F3F9;
border: none; border: none;
height: 30px; height: 30px;
border-radius: 4px;
} }
.settle .all-settle-serch .seach-input { .settle .all-settle-serch .seach-input {
margin-right: 8px; margin-right: 8px;
...@@ -186,6 +187,10 @@ ...@@ -186,6 +187,10 @@
color: #5874d8; color: #5874d8;
font-size: 18px; font-size: 18px;
} }
.order-detail .el-dialog__header .el-dialog__title i{
color: #5874d8;
font-size: 20px;
}
.order-detail .el-dialog__header .el-dialog__headerbtn i{ .order-detail .el-dialog__header .el-dialog__headerbtn i{
color:#8F97A4; color:#8F97A4;
font-size: 24px; font-size: 24px;
...@@ -217,11 +222,6 @@ ...@@ -217,11 +222,6 @@
} }
/*******************************范围start******************************/ /*******************************范围start******************************/
.order-detail-tab .tag{ .order-detail-tab .tag{
/*background: #F1F3F8;*/ /*background: #F1F3F8;*/
...@@ -246,16 +246,13 @@ ...@@ -246,16 +246,13 @@
width: 100px; width: 100px;
} }
/*******增加品牌start************/ /*******增加品牌start************/
.addcate{ .addcate{
height: 492px; height: 492px;
} }
.addcate .el-dialog__header{ .addcate .el-dialog__header{
background: #ffffff ; background: #ffffff ;
padding-left: 30px; padding-left: 21px;
} }
.addcate .el-dialog__header .el-dialog__title{ .addcate .el-dialog__header .el-dialog__title{
color: #5B76D1 ; color: #5B76D1 ;
...@@ -501,8 +498,6 @@ ...@@ -501,8 +498,6 @@
padding: 15px; padding: 15px;
} }
/*******************************范围start******************************/ /*******************************范围start******************************/
.order-detail-tab .tag{ .order-detail-tab .tag{
padding: 5px 24px; padding: 5px 24px;
...@@ -528,8 +523,7 @@ ...@@ -528,8 +523,7 @@
} }
.add-protect form{ .add-protect form{
width: 365px; width: 402px;
margin-left: 20px;
} }
.add-protect .el-form-item{ .add-protect .el-form-item{
margin-bottom: 7px; margin-bottom: 7px;
...@@ -539,7 +533,7 @@ ...@@ -539,7 +533,7 @@
padding: 5px ; padding: 5px ;
border-radius: 3px; border-radius: 3px;
margin-right: 10px; margin-right: 10px;
color: #8F97A4 !important; color: #333333 !important;
border: 1px solid #5874D8; border: 1px solid #5874D8;
display: inline-block; display: inline-block;
height: 25px; height: 25px;
......
...@@ -32,8 +32,8 @@ ...@@ -32,8 +32,8 @@
<el-option :label="item.label" :value="item.value" :key='item.label' v-for='(item,index) in search.options2'></el-option> <el-option :label="item.label" :value="item.value" :key='item.label' v-for='(item,index) in search.options2'></el-option>
</el-select> </el-select>
<el-input class="seach-input" v-model='search.name' prefix-icon="el-icon-search" placeholder='输入项目名,合作商名查询' size="mini"></el-input> <el-input class="seach-input" v-model='search.name' prefix-icon="el-icon-search" placeholder='输入项目名,合作商名查询' size="mini"></el-input>
<el-button type='primary' class='firstbackgroud_blue' size="mini">搜索</el-button> <el-button type='primary' class='firstbackgroud_blue firstborder_blue' size="mini">搜索</el-button>
<el-button type='primary' class='firstbackgroud_blue addbutton' @click='settleFun()' size="mini">结算</el-button> <el-button type='primary' class='firstbackgroud_blue addbutton firstborder_blue' @click='settleFun()' size="mini">结算</el-button>
</div> </div>
<div class="settle-content firsttext_font"> <div class="settle-content firsttext_font">
<table class="table-header"> <table class="table-header">
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
<span class='firsttext_blue'>{{item.construst }}</span> <span class='firsttext_blue'>{{item.construst }}</span>
</td> </td>
<td> <td>
<p>{{item.info }}</p> <p class="info">{{item.info }}</p>
<p class="detail">{{item.detail }}</p> <p class="detail">{{item.detail }}</p>
</td> </td>
<td> <td>
...@@ -95,7 +95,8 @@ ...@@ -95,7 +95,8 @@
</div> </div>
</body> </body>
<!-- 先引入 Vue --> <!-- 先引入 Vue -->
<script src="./../static/js/vue.js"></script> <script src="./../static/js/vue.js"></script>
<script src="./../static/js/jquery.js"></script>
<!-- 引入组件库 --> <!-- 引入组件库 -->
<script src="https://unpkg.com/element-ui/lib/index.js"></script> <script src="https://unpkg.com/element-ui/lib/index.js"></script>
<script src="./../static/js/common.js"></script> <script src="./../static/js/common.js"></script>
...@@ -144,28 +145,21 @@ ...@@ -144,28 +145,21 @@
}, },
], ],
// chooseData:[],
} }
}, },
created(){ created(){
}, },
methods:{ methods:{
//处理左侧切换
handleSelect(key, keyPath) { handleSelect(key, keyPath) {
this.tabindex = key; this.tabindex = key;
switch(Number(key)){
case 1:
// this.modal = VAll
break;
default:
this.modal = null
break;
}
}, },
//单个选择
select_data(item){ select_data(item){
console.log(item, this.table.chooseData)
this.table.chooseData.push(item); this.table.chooseData.push(item);
}, },
//全选
select_all(){ select_all(){
if(this.table.checked_all){ if(this.table.checked_all){
this.table.chooseData = this.tableData; this.table.chooseData = this.tableData;
...@@ -180,16 +174,11 @@ ...@@ -180,16 +174,11 @@
} }
}, },
// 分页
handleCurrentChange(page) { handleCurrentChange(page) {
}, },
checkData(row,event, column){ //结算
console.log(row.status)
},
handleSelectionChange(val){
// this.chooseData = val;
// console.log(val)
},
settleFun(){ settleFun(){
if(this.table.chooseData.length>0){ if(this.table.chooseData.length>0){
this.modalData = this.chooseData; this.modalData = this.chooseData;
...@@ -197,19 +186,22 @@ ...@@ -197,19 +186,22 @@
}else{ }else{
this.$message({ message: '请选择数据', type: 'warning' }); this.$message({ message: '请选择数据', type: 'warning' });
} }
}, },
// 关闭子组件
closeChild(){ closeChild(){
this.modal = null this.modal = null
}, },
opendialog(row){ opendialog(row){
if(row.status==1){ if(row.status==1){
//结算详情
this.modalData = row; this.modalData = row;
this.modal = settleDetail; this.modal = settleDetail;
}else if(row.status==3){ }else if(row.status==3){
//结算工单
this.modalData = row; this.modalData = row;
this.modal = payDetail; this.modal = payDetail;
}else if(row.status==2){ }else if(row.status==2){
//待解工单
this.modalData = row; this.modalData = row;
this.modal = vSettle; this.modal = vSettle;
} }
......
// 结算
var vPay={ var vPay={
template: ` template: `
<el-dialog :title="dialog.title" width='444px' :visible.sync="dialog.show" custom-class='settle-dialog' @close="handleClose" :append-to-body="true" :show-close='true'> <el-dialog :title="dialog.title" width='444px' :visible.sync="dialog.show" custom-class='settle-dialog' @close="handleClose" :append-to-body="true" :show-close='true'>
...@@ -29,7 +30,6 @@ var vPay={ ...@@ -29,7 +30,6 @@ var vPay={
}, },
data(){ data(){
return{ return{
detail:{ },uploadApi:'',
price:'',remark:'',total:'', price:'',remark:'',total:'',
dialog:{ dialog:{
show:true,title:'工单结算',tab:'1', show:true,title:'工单结算',tab:'1',
...@@ -37,9 +37,9 @@ var vPay={ ...@@ -37,9 +37,9 @@ var vPay={
} }
}, },
created(){ created(){
console.log(this.modalData)
}, },
methods:{ methods:{
// 传递事件
handleClose() { handleClose() {
this.$emit('close') this.$emit('close')
}, },
......
// 付款详情
var payDetail={ var payDetail={
template: ` template: `
<el-dialog :title="dialog.title" :visible.sync="dialog.show" custom-class='pay-detail animated slideInRight' @close="handleClose" :append-to-body="true" :show-close='true'> <el-dialog width="570px" :visible.sync="dialog.show" custom-class='pay-detail animated slideInRight' @close="handleClose" :append-to-body="true" :show-close='true'>
<div slot='title' class="el-dialog__title">
<i class="iconfont iconjiesuan"></i>
{{dialog.title}}
</div>
<el-tabs v-model="dialog.tab" type="card" @tab-click="handleClick"> <el-tabs v-model="dialog.tab" type="card" @tab-click="handleClick">
<el-tab-pane label="详情" name="1"> <el-tab-pane label="详情" name="1">
<h2 class="line-left">付款信息</h2> <h2 class="line-left">付款信息</h2>
...@@ -61,8 +66,5 @@ var payDetail={ ...@@ -61,8 +66,5 @@ var payDetail={
handleClick(){ handleClick(){
}, },
edictFun(){
this.isdedict = true;
}
} }
} }
\ No newline at end of file
// 结算工单
var vSettle={ var vSettle={
template: ` template: `
<el-dialog :title="dialog.title" width='444px' :visible.sync="dialog.show" custom-class='settle-dialog ' @close="handleClose" :append-to-body="true" :show-close='true'> <el-dialog :title="dialog.title" width='444px' :visible.sync="dialog.show" custom-class='settle-dialog ' @close="handleClose" :append-to-body="true" :show-close='true'>
...@@ -34,7 +35,6 @@ var vSettle={ ...@@ -34,7 +35,6 @@ var vSettle={
}, },
data(){ data(){
return{ return{
detail:{ },uploadApi:'',
form:{number:'',remark:''}, form:{number:'',remark:''},
dialog:{ dialog:{
show:true,title:'结算工单',tab:'1', show:true,title:'结算工单',tab:'1',
......
// 待结工单
var settleDetail={ var settleDetail={
template: ` template: `
<el-dialog :title="dialog.title" :visible.sync="dialog.show" custom-class='pay-detail animated slideInRight' @close="handleClose" :append-to-body="true" :show-close='true'> <el-dialog width="570px" :visible.sync="dialog.show" custom-class='pay-detail animated slideInRight' @close="handleClose" :append-to-body="true" :show-close='true'>
<div slot='title' class="el-dialog__title">
<i class="iconfont iconjiesuan"></i>
{{dialog.title}}
</div>
<div class="dialog-content"> <div class="dialog-content">
<div class="edict-icon"> <div class="edict-icon">
<i class="el-icon-edit-outline" @click='edictFun()' ></i> <i class="el-icon-edit-outline" @click='edictFun()' ></i>
...@@ -49,10 +54,10 @@ var settleDetail={ ...@@ -49,10 +54,10 @@ var settleDetail={
<i class="el-icon-arrow-left"></i> <i class="el-icon-arrow-left"></i>
<i class="el-icon-arrow-right"></i> <i class="el-icon-arrow-right"></i>
<div class="pay-carousel-content"> <div class="pay-carousel-content">
<img src="../static/images/man.jpg" alt="" width="120px" height="120px" class="one"> <img src="../static/images/man.jpg" alt="" width="100px" height="120px" class="one">
<img src="../static/images/man.jpg" alt="" width="120px" height="120px"> <img src="../static/images/man.jpg" alt="" width="100px" height="120px">
<img src="../static/images/man.jpg" alt="" width="120px" height="120px"> <img src="../static/images/man.jpg" alt="" width="100px" height="120px">
<img src="../static/images/man.jpg" alt="" width="120px" height="120px"> <img src="../static/images/man.jpg" alt="" width="100px" height="120px">
</div> </div>
</div> </div>
<p> <p>
...@@ -85,10 +90,10 @@ var settleDetail={ ...@@ -85,10 +90,10 @@ var settleDetail={
handleClick(){ handleClick(){
}, },
//待解工单
edictFun(){ edictFun(){
this.innerData = {}; this.innerData = {};
this.modal = vSettle; this.modal = vSettle;
}, },
closeChild(){ closeChild(){
this.modal = null; this.modal = null;
......
...@@ -74,6 +74,7 @@ ...@@ -74,6 +74,7 @@
background: #F1F3F9; background: #F1F3F9;
border: none; border: none;
height: 30px; height: 30px;
border-radius: 4px;
} }
.settle-right .all-settle-serch .seach-input .el-input__inner,.settle-right .all-settle-serch .seach-input { .settle-right .all-settle-serch .seach-input .el-input__inner,.settle-right .all-settle-serch .seach-input {
width: 298px; width: 298px;
...@@ -141,11 +142,14 @@ ...@@ -141,11 +142,14 @@
.settle-right .settle-content .table-body td:nth-child(8),.settle-right .settle-content .table-header th:nth-child(8){ .settle-right .settle-content .table-body td:nth-child(8),.settle-right .settle-content .table-header th:nth-child(8){
width: 8.5%; width: 8.5%;
} }
.settle-right .settle-content .table-body td,.settle-right .settle-content .table-cell .info{
font-size: 12px;
}
.settle-right .settle-content .table-cell{ .settle-right .settle-content .table-cell{
border: 1px solid #E2E2E2; border: 1px solid #E2E2E2;
margin: 5px 0; margin: 5px 0;
border-radius: 5px; border-radius: 5px;
height: 74px; height: 40px;
font-size: 12px; font-size: 12px;
} }
.settle-right .settle-content .table-cell:nth-of-type(odd){ .settle-right .settle-content .table-cell:nth-of-type(odd){
...@@ -154,12 +158,14 @@ ...@@ -154,12 +158,14 @@
.settle-right .settle-content .table-cell .detail{ .settle-right .settle-content .table-cell .detail{
font-size: 12px; font-size: 12px;
color: #999; color: #999;
} }
.settle-right .settle-content table th{ .settle-right .settle-content table th{
background: #eef1fa; background: #eef1fa;
color: #666; color: #666666;
text-align: center; text-align: center;
font-size: 12px;
font-weight: normal;
} }
.settle-right .settle-content table td .cell{ .settle-right .settle-content table td .cell{
/*font-size: 12px;*/ /*font-size: 12px;*/
...@@ -233,7 +239,7 @@ ...@@ -233,7 +239,7 @@
} }
.pay-detail{ .pay-detail{
width: 720px; /*width: 720px;*/
height: 638px; height: 638px;
float: right; float: right;
} }
...@@ -331,14 +337,14 @@ ...@@ -331,14 +337,14 @@
font-size: 12px; font-size: 12px;
} }
.pay-carousel{ .pay-carousel{
height: 135px; height: 135px;
margin: auto; margin: auto;
padding: 0 100px; position: relative;
position: relative; padding-left: 30px;
padding-right: 50px;
text-align: center;
} }
.pay-carousel-content{ .pay-carousel-content{
/*width: 520px;*/
/*border: 1px solid #ececec;*/
margin: auto; margin: auto;
height: 135px; height: 135px;
overflow: hidden; overflow: hidden;
...@@ -355,66 +361,6 @@ ...@@ -355,66 +361,6 @@
top: 35%; top: 35%;
font-size: 28px; font-size: 28px;
} }
/*.order-detail{
width: 720px;
height: 670px;
}
.dialog-content{
position: relative;
}
.dialog-content .edict-icon{
position: absolute;right: 20px;
top:0;z-index: 3000;
}
.dialog-content .edict-icon i{
font-size: 24px;
color: #5874D8;
cursor: pointer;
}
.dialog-content .edict-icon i:nth-child(1){
margin-right: 15px;
}
.el-dialog__wrapper{
overflow: hidden !important;
}
.order-detail h2{
padding-left: 20px;
}
.order-detail .el-tabs--card>.el-tabs__header{
padding: 0 20px;
}
.order-detail .el-dialog__body{
padding:30px 0;
}
.order-detail .el-dialog__header{
background: #6C8BF8;
}
.order-detail .el-dialog__header .el-dialog__title,.order-detail .el-dialog__header .el-dialog__headerbtn i{
color: #ffffff;
}
.order-detail .order-detail-tab{
margin-top: 5px;
line-height: 2;
border-bottom: 1px solid #ececec;
padding-bottom: 10px;
margin-bottom: 10px;
padding-left: 20px;
}
.order-detail .order-detail-tab p{
color: #999;
font-size: 12px;
}
.order-detail .order-detail-tab span{
color: #333;
font-size: 12px;
}
.order-detail .seach-input .el-input__inner,.order-detail .seach-input {
width: 200px;
height: 25px;
}*/
/************************确权start******************************/ /************************确权start******************************/
.el-carousel__item h3 { .el-carousel__item h3 {
......
...@@ -41,6 +41,9 @@ button,.el-button{ ...@@ -41,6 +41,9 @@ button,.el-button{
background: #5874D8; background: #5874D8;
border: #5874D8; border: #5874D8;
} }
.text_underline{
text-decoration: underline;
}
.el-pagination.is-background .el-pager li:not(.disabled).active{ .el-pagination.is-background .el-pager li:not(.disabled).active{
background-color: #f5f5f5; background-color: #f5f5f5;
color: #5874d8; color: #5874d8;
...@@ -161,6 +164,16 @@ button,.el-button{ ...@@ -161,6 +164,16 @@ button,.el-button{
float: left; float: left;
line-height: 60px; line-height: 60px;
margin-left: 10px; margin-left: 10px;
width: 125px;
}
.popover-content{
line-height: 2;
padding: 0 20px;
}
.header-title i{
float: right;
font-size: 18px;
margin-top: 20px;
} }
.header-side{ .header-side{
float: right; float: right;
...@@ -183,7 +196,7 @@ button,.el-button{ ...@@ -183,7 +196,7 @@ button,.el-button{
.header .header-side .mian_side .el-menu-item i{ .header .header-side .mian_side .el-menu-item i{
color: #ffffff; color: #ffffff;
vertical-align: middle; vertical-align: middle;
margin-right: 2px; margin-right: 6px;
} }
.header .header-side .mian_side .el-menu-item.is-active{ .header .header-side .mian_side .el-menu-item.is-active{
border-bottom: 2px solid #F5F5F5; border-bottom: 2px solid #F5F5F5;
...@@ -216,6 +229,7 @@ ul .iconfont { ...@@ -216,6 +229,7 @@ ul .iconfont {
.circle-red,.circle-yellow,.circle-green{ .circle-red,.circle-yellow,.circle-green{
position: relative; position: relative;
padding-left: 15px; padding-left: 15px;
font-size: 12px;
} }
.circle-red:before{ .circle-red:before{
position: absolute; position: absolute;
...@@ -335,4 +349,17 @@ ul .iconfont { ...@@ -335,4 +349,17 @@ ul .iconfont {
width: 120px; width: 120px;
height: 120px; height: 120px;
display: block; display: block;
}
.el-select ::-webkit-input-placeholder { /* WebKit, Blink, Edge */
color: #666666 !important;
}
.el-select :-moz-placeholder { /* Mozilla Firefox 4 to 18 */
color: #666666 !important;
}
.el-select ::-moz-placeholder { /* Mozilla Firefox 19+ */
color: #666666 !important;
}
.el-select :-ms-input-placeholder { /* Internet Explorer 10-11 */
color: #666666 !important;
} }
\ No newline at end of file
...@@ -3,7 +3,15 @@ var commonHeader={ ...@@ -3,7 +3,15 @@ var commonHeader={
<div class="header-content"> <div class="header-content">
<div class="header-logo"> <div class="header-logo">
<img src="./../static/images/dog.jpeg" alt="" width="42px" height="42px"> <img src="./../static/images/dog.jpeg" alt="" width="42px" height="42px">
<p class="header-title">Hi!隔壁老王</p> <p class="header-title">
Hi!隔壁老王
<i class="el-icon-caret-bottom" v-popover:popoverHeader></i>
<el-popover ref="popoverHeader" placement="bottom" width="110" trigger="click" >
<div class="popover-content">
<div>退出登录</div>
</div>
</el-popover>
</p>
</div> </div>
<div class="header-side firstbackgroud_blue"> <div class="header-side firstbackgroud_blue">
<el-menu mode="horizontal" :router="false" :unique-opened="true" @select="selectRoute" :default-active="onRoutes" background-color="#5874d8" text-color="#ffffff" active-text-color="#708DF1" class="mian_side"> <el-menu mode="horizontal" :router="false" :unique-opened="true" @select="selectRoute" :default-active="onRoutes" background-color="#5874d8" text-color="#ffffff" active-text-color="#708DF1" class="mian_side">
......
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