Commit c3fb9f2b authored by 李晓兵's avatar 李晓兵

Merge branch 'develop' of https://hel.hand-china.com/xugong/hls-xcmg-vue-app into develop

parents ccb9a0ab 36eeb012
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Descrip: 产品明细 * @Descrip: 产品明细
* @Author: your name * @Author: your name
* @Date: 2019-10-15 14:30:00 * @Date: 2019-10-15 14:30:00
* @LastEditTime: 2019-10-16 17:03:14 * @LastEditTime: 2019-10-17 19:12:22
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
--> -->
<template> <template>
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
</div> </div>
</h-header> </h-header>
<Tab @getTabNum="getTabNum" /> <Tab @getTabNum="getTabNum" />
<!-- 基本信息 -->
<h-content v-if="tabNum === 0"> <h-content v-if="tabNum === 0">
<list-item :item-height="44" class="second-part"> <list-item :item-height="44" class="second-part">
<item> <item>
...@@ -64,6 +65,7 @@ ...@@ -64,6 +65,7 @@
</item> </item>
</list-item> </list-item>
</h-content> </h-content>
<!-- 商品详情 -->
<h-content v-if="tabNum === 1"> <h-content v-if="tabNum === 1">
<list-item :item-height="44" class="second-part"> <list-item :item-height="44" class="second-part">
<item> <item>
...@@ -76,6 +78,7 @@ ...@@ -76,6 +78,7 @@
</item> </item>
</list-item> </list-item>
</h-content> </h-content>
<!-- 产品配置 -->
<h-content v-if="tabNum === 2"> <h-content v-if="tabNum === 2">
<list-item :item-height="44" class="second-part"> <list-item :item-height="44" class="second-part">
<item> <item>
...@@ -130,6 +133,7 @@ export default { ...@@ -130,6 +133,7 @@ export default {
console.log(i) console.log(i)
this.tabNum = i this.tabNum = i
}, },
// 收藏
collect () { collect () {
this.collect_flag = true this.collect_flag = true
console.log(this.collect_flag) console.log(this.collect_flag)
...@@ -138,6 +142,7 @@ export default { ...@@ -138,6 +142,7 @@ export default {
this.src = require('@/assets/productQuery/coll-success.png') this.src = require('@/assets/productQuery/coll-success.png')
}, 1500) }, 1500)
}, },
// 基本信息查询
baseMsg () { baseMsg () {
let vm = this let vm = this
let url = $config.basePath + 'prd_product_info' let url = $config.basePath + 'prd_product_info'
...@@ -153,6 +158,7 @@ export default { ...@@ -153,6 +158,7 @@ export default {
} }
}) })
}, },
// 详情查询
detailMsg () { detailMsg () {
let vm = this let vm = this
let url = $config.basePath + 'prd_product_detial' let url = $config.basePath + 'prd_product_detial'
...@@ -168,6 +174,7 @@ export default { ...@@ -168,6 +174,7 @@ export default {
} }
}) })
}, },
// 配置查询
confgMsg () { confgMsg () {
let vm = this let vm = this
let url = $config.basePath + 'prd_product_conf' let url = $config.basePath + 'prd_product_conf'
......
...@@ -65,6 +65,7 @@ export default { ...@@ -65,6 +65,7 @@ export default {
}, },
methods: methods:
{ {
// 根据产品线查询列表
proQuery () { proQuery () {
let vm = this let vm = this
let url = $config.basePath + 'prd_product_list' let url = $config.basePath + 'prd_product_list'
...@@ -80,6 +81,7 @@ export default { ...@@ -80,6 +81,7 @@ export default {
} }
}) })
}, },
// val:产品id
goDetailed (val) { goDetailed (val) {
this.$router.push({ this.$router.push({
name: 'ProDetailed', name: 'ProDetailed',
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Descrip: 查询首页 * @Descrip: 查询首页
* @Author: your name * @Author: your name
* @Date: 2019-10-15 14:30:00 * @Date: 2019-10-15 14:30:00
* @LastEditTime: 2019-10-17 16:07:07 * @LastEditTime: 2019-10-17 19:07:02
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
--> -->
<template> <template>
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
</div> </div>
</h-header> </h-header>
<h-content> <h-content>
<!-- 搜索 -->
<div class="hinput"> <div class="hinput">
<div class="search-box"> <div class="search-box">
<input type="text" placeholder="请输入产品类别/产品线"> <input type="text" placeholder="请输入产品类别/产品线">
...@@ -68,6 +69,7 @@ export default { ...@@ -68,6 +69,7 @@ export default {
}, },
methods: methods:
{ {
// 产品查询
proQuery () { proQuery () {
let vm = this let vm = this
let url = $config.basePath + 'prd_product_type_list' let url = $config.basePath + 'prd_product_type_list'
...@@ -81,6 +83,7 @@ export default { ...@@ -81,6 +83,7 @@ export default {
} }
}) })
}, },
// 跳列表 val = 产品线
goLists (val) { goLists (val) {
this.$router.push({ this.$router.push({
name: 'ProductList', name: 'ProductList',
...@@ -89,6 +92,8 @@ export default { ...@@ -89,6 +92,8 @@ export default {
}, },
}) })
}, },
// 产品线查询val=主机厂id,ind=产品列表索引
queryDivision (val, ind) { queryDivision (val, ind) {
let vm = this let vm = this
let url = $config.basePath + 'prd_product_division_list' let url = $config.basePath + 'prd_product_division_list'
...@@ -111,6 +116,7 @@ export default { ...@@ -111,6 +116,7 @@ export default {
object: {}, object: {},
returnItem: function (index, obj) { returnItem: function (index, obj) {
console.log('index:' + index + ',object:' + vum.toJson(obj)) console.log('index:' + index + ',object:' + vum.toJson(obj))
// 更改产品线(division)和 产品线描述(division_n)
vm.prolists[ind].division_n = obj.bp_type_n vm.prolists[ind].division_n = obj.bp_type_n
vm.prolists[ind].division = obj.bp_type vm.prolists[ind].division = obj.bp_type
}, },
...@@ -123,11 +129,7 @@ export default { ...@@ -123,11 +129,7 @@ export default {
} }
}) })
}, },
checkDivision (val, division, index) {
this.prolists[index].division_n = val
this.prolists[index].division = division
this.list_flag = !this.list_flag
},
}, },
} }
</script> </script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment