Browse Source

1.货架删除bug

dev-warehouse
0.0 2 years ago
parent
commit
ac10a5da65
  1. 4
      src/option/basicdata/basicdataGoodsAllocation.js
  2. 50
      src/views/basicdata/warehouse/goodsArea/basicdataGoodsArea.vue
  3. 24
      src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
  4. 10
      src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue

4
src/option/basicdata/basicdataGoodsAllocation.js

@ -222,11 +222,11 @@ export default {
align:'center', align:'center',
editDisplay: false, editDisplay: false,
viewDisplay: false, viewDisplay: false,
hide: true, hide: false,
}, },
{ {
label: "货位状态", label: "货位状态",
prop: "allocationStatuc", prop: "allocationStatus",
type: "select", type: "select",
search: true, search: true,
labelWidth:'100', labelWidth:'100',

50
src/views/basicdata/warehouse/goodsArea/basicdataGoodsArea.vue

@ -18,17 +18,17 @@
<!-- </el-option>--> <!-- </el-option>-->
<!-- </el-select>--> <!-- </el-select>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="启用状态:" prop="areaStatus"> <!-- <el-form-item label="启用状态:" prop="areaStatus">-->
<!-- <el-input v-model="form.areaStatus" placeholder="请输入货区状态;1-启用,2-禁用"/>--> <!-- &lt;!&ndash; <el-input v-model="form.areaStatus" placeholder="请输入货区状态;1-启用,2-禁用"/>&ndash;&gt;-->
<el-select v-model="query.enableStatus" clearable placeholder="请选择启用状态" style="width: 88%;"> <!-- <el-select v-model="query.enableStatus" clearable placeholder="请选择启用状态" style="width: 88%;">-->
<el-option <!-- <el-option-->
v-for="item in enableStatus" <!-- v-for="item in enableStatus"-->
:key="item.dictKey" <!-- :key="item.dictKey"-->
:label="item.dictValue" <!-- :label="item.dictValue"-->
:value="item.dictKey"> <!-- :value="item.dictKey">-->
</el-option> <!-- </el-option>-->
</el-select> <!-- </el-select>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="货区类型:" prop="areaStatus"> <el-form-item label="货区类型:" prop="areaStatus">
<!-- <el-input v-model="form.areaStatus" placeholder="请输入货区状态;1-启用,2-禁用"/>--> <!-- <el-input v-model="form.areaStatus" placeholder="请输入货区状态;1-启用,2-禁用"/>-->
<el-select v-model="query.areaType" clearable placeholder="请选择货区类型" style="width: 88%;"> <el-select v-model="query.areaType" clearable placeholder="请选择货区类型" style="width: 88%;">
@ -82,20 +82,20 @@
:key="index"> :key="index">
</el-table-column> </el-table-column>
</template> </template>
<el-table-column <!-- <el-table-column-->
prop="enableStatus" <!-- prop="enableStatus"-->
label="货区状态" <!-- label="货区状态"-->
align="center" <!-- align="center"-->
width="150"> <!-- width="150">-->
<template #default="{row,$index}" > <!-- <template #default="{row,$index}" >-->
<el-switch <!-- <el-switch-->
active-color="#13ce66" <!-- active-color="#13ce66"-->
inactive-color="#ff4949" <!-- inactive-color="#ff4949"-->
v-model="row.enableState" <!-- v-model="row.enableState"-->
@change="changeStatus($event,row,$index)"> <!-- @change="changeStatus($event,row,$index)">-->
</el-switch> <!-- </el-switch>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<!-- 操作栏模块 --> <!-- 操作栏模块 -->
<el-table-column prop="menu" label="操作" :width="220" align="center"> <el-table-column prop="menu" label="操作" :width="220" align="center">
<template #="{row}"> <template #="{row}">

24
src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue

@ -23,17 +23,17 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="启用状态:" prop="areaStatus"> <!-- <el-form-item label="启用状态:" prop="areaStatus">-->
<!-- <el-input v-model="form.areaStatus" placeholder="请输入货区状态;1-启用,2-禁用"/>--> <!-- &lt;!&ndash; <el-input v-model="form.areaStatus" placeholder="请输入货区状态;1-启用,2-禁用"/>&ndash;&gt;-->
<el-select v-model="query.enableStatus" clearable placeholder="请选择启用状态" style="width: 80%;"> <!-- <el-select v-model="query.enableStatus" clearable placeholder="请选择启用状态" style="width: 80%;">-->
<el-option <!-- <el-option-->
v-for="item in enableStatusData" <!-- v-for="item in enableStatusData"-->
:key="item.dictKey" <!-- :key="item.dictKey"-->
:label="item.dictValue" <!-- :label="item.dictValue"-->
:value="item.dictKey"> <!-- :value="item.dictKey">-->
</el-option> <!-- </el-option>-->
</el-select> <!-- </el-select>-->
</el-form-item> <!-- </el-form-item>-->
<el-button type="primary" icon="el-icon-search" @click="searchChange" > </el-button> <el-button type="primary" icon="el-icon-search" @click="searchChange" > </el-button>
<el-button icon="el-icon-delete" @click="searchReset()"> </el-button> <el-button icon="el-icon-delete" @click="searchReset()"> </el-button>
</el-col> </el-col>
@ -48,7 +48,7 @@
<el-button type="primary" icon="el-icon-plus" @click="handleAdd"> </el-button> <el-button type="primary" icon="el-icon-plus" @click="handleAdd"> </el-button>
<el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain> </el-button> <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain> </el-button>
<!-- <el-button type="danger" icon="el-icon-delete" @click="aaa" plain>导出二维码</el-button>--> <!-- <el-button type="danger" icon="el-icon-delete" @click="aaa" plain>导出二维码</el-button>-->
<el-button type="danger" icon="el-icon-delete" @click="viewQrCode" plain>查看二维码</el-button> <!-- <el-button type="danger" icon="el-icon-delete" @click="viewQrCode" plain>查看二维码</el-button>-->
</div> </div>
<!-- 头部右侧按钮模块 --> <!-- 头部右侧按钮模块 -->

10
src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue

@ -28,11 +28,11 @@
v-if="permission.warehouseWarehouse_delete" v-if="permission.warehouseWarehouse_delete"
@click="handleDelete"> @click="handleDelete">
</el-button> </el-button>
<el-button type="warning" <!-- <el-button type="warning"-->
plain <!-- plain-->
icon="el-icon-download" <!-- icon="el-icon-download"-->
@click="handleExport"> <!-- @click="handleExport"> -->
</el-button> <!-- </el-button>-->
</template> </template>
<!-- <template #menu="{size,row,index}">--> <!-- <template #menu="{size,row,index}">-->
<!--&lt;!&ndash; <el-button type="primary" text icon="el-icon-view" @click="editDeline(row)">查看地图</el-button>&ndash;&gt;--> <!--&lt;!&ndash; <el-button type="primary" text icon="el-icon-view" @click="editDeline(row)">查看地图</el-button>&ndash;&gt;-->

Loading…
Cancel
Save