|
|
|
@ -12,12 +12,13 @@ |
|
|
|
</div> |
|
|
|
<div class="item1"> |
|
|
|
<el-text size="large" style="width:4vw;">所属地区</el-text> |
|
|
|
<el-cascader style="width: 9vw;" v-model="searchForm.markets" :options="market" |
|
|
|
placeholder="请选择所属地区" clearable @change="handleMarketChange" /> |
|
|
|
<el-cascader style="width: 9vw;" v-model="searchForm.markets" :options="market" placeholder="请选择所属地区" |
|
|
|
clearable @change="handleMarketChange" /> |
|
|
|
</div> |
|
|
|
<div class="item1"> |
|
|
|
<el-text size="large" style="width:4vw;">产品名称</el-text> |
|
|
|
<el-cascader v-model="searchForm.goodsName" :options="productList" style="width: 10vw;" placeholder="请选择产品名称" clearable /> |
|
|
|
<el-cascader v-model="searchForm.goodsName" :options="productList" style="width: 10vw;" |
|
|
|
placeholder="请选择产品名称" clearable /> |
|
|
|
</div> |
|
|
|
<div class="item1"> |
|
|
|
<el-text size="large" style="width:4vw;">订单状态</el-text> |
|
|
|
@ -284,6 +285,8 @@ |
|
|
|
style="width: 30px; height: 30px;"> |
|
|
|
<img v-if="currentStep === 5" src="@/assets/images/待审核.png" alt="步骤图标" |
|
|
|
style="width: 30px; height: 30px;"> |
|
|
|
<img v-if="currentStep > 5" src="@/assets/images/已审核.png" alt="步骤图标" |
|
|
|
style="width: 30px; height: 30px;"> |
|
|
|
</template> |
|
|
|
</el-step> |
|
|
|
</el-steps> |
|
|
|
@ -700,33 +703,33 @@ const productList = [ |
|
|
|
|
|
|
|
] |
|
|
|
const getMarket = async function () { |
|
|
|
try { |
|
|
|
const result = await API({ |
|
|
|
|
|
|
|
url: '/market/selectMarket', |
|
|
|
}) |
|
|
|
console.log('看看地区树', result) |
|
|
|
|
|
|
|
const transformTree = (nodes) => { |
|
|
|
const allChildren = nodes.flatMap(node => node.children || []); |
|
|
|
|
|
|
|
return allChildren.map(child => { |
|
|
|
const grandchildren = child.children && child.children.length |
|
|
|
? transformTree([child]) |
|
|
|
: null; |
|
|
|
try { |
|
|
|
const result = await API({ |
|
|
|
|
|
|
|
return { |
|
|
|
value: child.name, |
|
|
|
label: child.name, |
|
|
|
children: grandchildren |
|
|
|
url: '/market/selectMarket', |
|
|
|
}) |
|
|
|
console.log('看看地区树', result) |
|
|
|
|
|
|
|
const transformTree = (nodes) => { |
|
|
|
const allChildren = nodes.flatMap(node => node.children || []); |
|
|
|
|
|
|
|
return allChildren.map(child => { |
|
|
|
const grandchildren = child.children && child.children.length |
|
|
|
? transformTree([child]) |
|
|
|
: null; |
|
|
|
|
|
|
|
return { |
|
|
|
value: child.name, |
|
|
|
label: child.name, |
|
|
|
children: grandchildren |
|
|
|
}; |
|
|
|
}); |
|
|
|
}; |
|
|
|
}); |
|
|
|
}; |
|
|
|
market.value = transformTree(result.data) |
|
|
|
console.log('转换后的地区树==============', market.value) |
|
|
|
} catch (error) { |
|
|
|
console.log('请求失败', error) |
|
|
|
} |
|
|
|
market.value = transformTree(result.data) |
|
|
|
console.log('转换后的地区树==============', market.value) |
|
|
|
} catch (error) { |
|
|
|
console.log('请求失败', error) |
|
|
|
} |
|
|
|
} |
|
|
|
const hideReject = function () { |
|
|
|
showReject.value = false |
|
|
|
|