Commit 46972609 authored by limengyang's avatar limengyang

fix(lmy): 区域现货修改

parent d1b64ebf
...@@ -183,6 +183,7 @@ ...@@ -183,6 +183,7 @@
delAreaList.value = result; delAreaList.value = result;
const curArr = delAreaList.value.map((it) => it.cityCode); const curArr = delAreaList.value.map((it) => it.cityCode);
for (const k of allAreaList.value) { for (const k of allAreaList.value) {
k.disabled = false;
if (curArr.includes(k.cityId)) { if (curArr.includes(k.cityId)) {
addCheckboxValue.value.push(k.cityId as number); addCheckboxValue.value.push(k.cityId as number);
k.disabled = true; k.disabled = true;
...@@ -427,7 +428,7 @@ ...@@ -427,7 +428,7 @@
class="top-search" class="top-search"
> >
<Row :gutter="20"> <Row :gutter="20">
<Col :xxl="4" :xl="6" :lg="8" :sm="12" :xs="24"> <Col :span="5">
<FormItem label="品牌名称" name="brandList"> <FormItem label="品牌名称" name="brandList">
<!-- <Input v-model:value="searchForm.brands" allow-clear placeholder="请输入品牌名称" /> --> <!-- <Input v-model:value="searchForm.brands" allow-clear placeholder="请输入品牌名称" /> -->
<a-select <a-select
...@@ -454,12 +455,12 @@ ...@@ -454,12 +455,12 @@
</a-select> </a-select>
</FormItem> </FormItem>
</Col> </Col>
<Col :xxl="4" :xl="6" :lg="8" :sm="12" :xs="24"> <Col :span="5">
<FormItem label="货号" name="goodsNo"> <FormItem label="货号" name="goodsNo">
<Input v-model:value="searchForm.goodsNo" allow-clear placeholder="请输入货号" /> <Input v-model:value="searchForm.goodsNo" allow-clear placeholder="请输入货号" />
</FormItem> </FormItem>
</Col> </Col>
<Col :xxl="4" :xl="6" :lg="8" :sm="12" :xs="24"> <Col :span="5">
<FormItem label="现货区域" name="areaIds"> <FormItem label="现货区域" name="areaIds">
<Select <Select
v-model:value="searchForm.areaIds" v-model:value="searchForm.areaIds"
...@@ -478,7 +479,7 @@ ...@@ -478,7 +479,7 @@
</Select> </Select>
</FormItem> </FormItem>
</Col> </Col>
<Col :xxl="4" :xl="6" :lg="8" :sm="12" :xs="24"> <Col :span="5">
<FormItem label="商品分组" name="types"> <FormItem label="商品分组" name="types">
<Select <Select
v-model:value="searchForm.types" v-model:value="searchForm.types"
...@@ -494,10 +495,14 @@ ...@@ -494,10 +495,14 @@
</Select> </Select>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="24" style="display: flex; justify-content: space-between"> <Col :span="4">
<div> <div>
<Button style="margin-right: 5px" @click="onRset">重置</Button>
<Button type="primary" style="margin: 0 5px" @click="onSearch">查询</Button> <Button type="primary" style="margin: 0 5px" @click="onSearch">查询</Button>
<Button style="margin: 0 5px" @click="onRset">重置</Button> </div>
</Col>
<Col :span="24" style="display: flex; justify-content: space-between">
<div>
<Button type="primary" @click="addProduct" style="margin: 0 5px">新增商品</Button> <Button type="primary" @click="addProduct" style="margin: 0 5px">新增商品</Button>
<Button type="primary" @click="batchImport" style="margin: 0 5px">批量导入</Button> <Button type="primary" @click="batchImport" style="margin: 0 5px">批量导入</Button>
<Button type="primary" @click="batchDel" style="margin: 0 5px">批量删除</Button> <Button type="primary" @click="batchDel" style="margin: 0 5px">批量删除</Button>
......
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