Commit 8516bc27 by 肖康

x

parent a08f0a7f
...@@ -136,7 +136,22 @@ ...@@ -136,7 +136,22 @@
multipleSelection: [] multipleSelection: []
}; };
}, },
watch: {}, watch: {
'formInline.brand_name'(val){
if(!val){
this.formInline.brand_id=""
return
}
var arr_=[]
this.brandList=this.brandList||[]
for(var i=0;i<this.brandList.length;i++){
arr_.push(this.brandList[i].value)
}
if(arr_.indexOf(val)==-1){
this.formInline.brand_id=""
}
}
},
created() { created() {
this.getData(); this.getData();
}, },
...@@ -207,6 +222,7 @@ ...@@ -207,6 +222,7 @@
}) })
}, },
handleSelectBrandName(item) { handleSelectBrandName(item) {
console.log(this.brandList)
this.formInline.brand_name = item.value; this.formInline.brand_name = item.value;
this.formInline.brand_id = item.brand_id; this.formInline.brand_id = item.brand_id;
}, },
......
...@@ -154,7 +154,22 @@ ...@@ -154,7 +154,22 @@
selectedOptions: [] selectedOptions: []
}; };
}, },
watch: {}, watch: {
'formInline.brand_name'(val){
if(!val){
this.formInline.brand_id=""
return
}
var arr_=[]
this.brandList=this.brandList||[]
for(var i=0;i<this.brandList.length;i++){
arr_.push(this.brandList[i].value)
}
if(arr_.indexOf(val)==-1){
this.formInline.brand_id=""
}
}
},
created() { created() {
this.getData(); this.getData();
this.getClass(); this.getClass();
......
...@@ -93,7 +93,8 @@ Vue.prototype.$message=Message ...@@ -93,7 +93,8 @@ Vue.prototype.$message=Message
multipleSelection: [], multipleSelection: [],
formInline: { formInline: {
goods_name: '', goods_name: '',
brand: '', brand_id: '',
brand_name: '',
date: '' date: ''
} }
}; };
...@@ -103,6 +104,20 @@ Vue.prototype.$message=Message ...@@ -103,6 +104,20 @@ Vue.prototype.$message=Message
if(!val){ if(!val){
this.formInline.date=[] this.formInline.date=[]
} }
},
'formInline.brand_name'(val){
if(!val){
this.formInline.brand_id=""
return
}
var arr_=[]
this.brandList=this.brandList||[]
for(var i=0;i<this.brandList.length;i++){
arr_.push(this.brandList[i].value)
}
if(arr_.indexOf(val)==-1){
this.formInline.brand_id=""
}
} }
}, },
created() { created() {
...@@ -115,7 +130,8 @@ Vue.prototype.$message=Message ...@@ -115,7 +130,8 @@ Vue.prototype.$message=Message
page: this.page, page: this.page,
limit: this.limit, limit: this.limit,
goods_name: this.formInline.goods_name, goods_name: this.formInline.goods_name,
brand: this.formInline.brand, brand_id: this.formInline.brand_id,
brand_name: this.formInline.brand_name,
start_time: this.formInline.date ? this.formInline.date[0] : '', start_time: this.formInline.date ? this.formInline.date[0] : '',
end_time: this.formInline.date ? this.formInline.date[1] : '' end_time: this.formInline.date ? this.formInline.date[1] : ''
}).then(res => { }).then(res => {
......
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
<el-table-column prop="quote_brand_name" label="报价品牌" width="200"></el-table-column> <el-table-column prop="quote_brand_name" label="报价品牌" width="200"></el-table-column>
<el-table-column prop="status" label="状态" width="100"> <el-table-column prop="status" label="状态" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.status==1" class="f-green">已报价</span> <span v-if="scope.row.status==1" class="f-green">比价中</span>
<span v-else-if="scope.row.status==2" class="f-yellow1">已选中</span> <span v-else-if="scope.row.status==2" class="f-yellow1">已选中</span>
<span v-else-if="scope.row.status==3">已确认</span> <span v-else-if="scope.row.status==3">已确认</span>
<span v-else-if="scope.row.status==4">已成单</span> <span v-else-if="scope.row.status==4">已成单</span>
...@@ -134,7 +134,8 @@ Vue.prototype.$message=Message ...@@ -134,7 +134,8 @@ Vue.prototype.$message=Message
multipleSelection: [], multipleSelection: [],
formInline: { formInline: {
goods_name: '', goods_name: '',
brand: '', brand_id: '',
brand_name:"",
date: '', date: '',
status: '' status: ''
} }
...@@ -145,6 +146,20 @@ Vue.prototype.$message=Message ...@@ -145,6 +146,20 @@ Vue.prototype.$message=Message
if(!val){ if(!val){
this.formInline.date=[] this.formInline.date=[]
} }
},
'formInline.brand_name'(val){
if(!val){
this.formInline.brand_id=""
return
}
var arr_=[]
this.brandList=this.brandList||[]
for(var i=0;i<this.brandList.length;i++){
arr_.push(this.brandList[i].value)
}
if(arr_.indexOf(val)==-1){
this.formInline.brand_id=""
}
} }
}, },
created() { created() {
...@@ -158,7 +173,8 @@ Vue.prototype.$message=Message ...@@ -158,7 +173,8 @@ Vue.prototype.$message=Message
page: this.page, page: this.page,
limit: this.limit, limit: this.limit,
goods_name: this.formInline.goods_name, goods_name: this.formInline.goods_name,
brand: this.formInline.brand, brand_id: this.formInline.brand_id,
brand_name: this.formInline.brand_name,
start_time: this.formInline.date ? this.formInline.date[0] : '', start_time: this.formInline.date ? this.formInline.date[0] : '',
end_time: this.formInline.date ? this.formInline.date[1] : '', end_time: this.formInline.date ? this.formInline.date[1] : '',
status: this.formInline.status status: this.formInline.status
......
...@@ -270,6 +270,20 @@ ...@@ -270,6 +270,20 @@
if(!val){ if(!val){
this.formInline.date=[] this.formInline.date=[]
} }
},
'formInline.brand_name'(val){
if(!val){
this.formInline.brand_id=""
return
}
var arr_=[]
this.brandList=this.brandList||[]
for(var i=0;i<this.brandList.length;i++){
arr_.push(this.brandList[i].value)
}
if(arr_.indexOf(val)==-1){
this.formInline.brand_id=""
}
} }
}, },
......
...@@ -6,12 +6,12 @@ ...@@ -6,12 +6,12 @@
<meta name="viewport" content="width=device-width,initial-scale=1.0"> <meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="http://yunxin.liexindev.net/favicon.ico"> <link rel="icon" href="http://yunxin.liexindev.net/favicon.ico">
<title>cloudsystem</title> <title>cloudsystem</title>
<link href="http://yunxin.liexindev.net/js/0.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/1.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/10.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/11.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/12.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/13.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/14.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/15.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/16.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/17.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/18.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/19.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/2.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/20.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/21.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/22.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/23.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/24.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/25.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/26.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/27.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/28.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/3.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/4.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/5.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/6.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/7.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/8.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/9.js" rel="prefetch"><link href="http://yunxin.liexindev.net/app.92011b01beafc1262426.js" rel="preload" as="script"></head> <link href="http://yunxin.liexindev.net/js/0.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/1.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/10.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/11.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/12.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/13.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/14.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/15.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/16.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/17.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/18.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/19.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/2.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/20.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/21.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/22.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/23.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/24.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/25.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/26.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/27.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/28.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/3.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/4.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/5.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/6.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/7.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/8.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/9.js" rel="prefetch"><link href="http://yunxin.liexindev.net/app.9358fc146056d17c564c.js" rel="preload" as="script"></head>
<body> <body>
<noscript> <noscript>
<strong>网络异常,请稍后加载</strong> <strong>网络异常,请稍后加载</strong>
</noscript> </noscript>
<div id="app"></div> <div id="app"></div>
<!-- built files will be auto injected --> <!-- built files will be auto injected -->
<script type="text/javascript" src="http://yunxin.liexindev.net/app.92011b01beafc1262426.js"></script></body> <script type="text/javascript" src="http://yunxin.liexindev.net/app.9358fc146056d17c564c.js"></script></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 sign in to comment