From ac10a5da651e782637804636c5517800ce57e6b1 Mon Sep 17 00:00:00 2001
From: "0.0" <1092404103.qq.com>
Date: Wed, 16 Aug 2023 21:31:38 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=B4=A7=E6=9E=B6=E5=88=A0=E9=99=A4bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../basicdata/basicdataGoodsAllocation.js | 4 +-
.../goodsArea/basicdataGoodsArea.vue | 50 +++++++++----------
.../goodsShelf/basicdataGoodsShelf.vue | 24 ++++-----
.../warehouse/basicdataWarehouse.vue | 10 ++--
4 files changed, 44 insertions(+), 44 deletions(-)
diff --git a/src/option/basicdata/basicdataGoodsAllocation.js b/src/option/basicdata/basicdataGoodsAllocation.js
index 113a37d4..a51c5627 100644
--- a/src/option/basicdata/basicdataGoodsAllocation.js
+++ b/src/option/basicdata/basicdataGoodsAllocation.js
@@ -222,11 +222,11 @@ export default {
align:'center',
editDisplay: false,
viewDisplay: false,
- hide: true,
+ hide: false,
},
{
label: "货位状态",
- prop: "allocationStatuc",
+ prop: "allocationStatus",
type: "select",
search: true,
labelWidth:'100',
diff --git a/src/views/basicdata/warehouse/goodsArea/basicdataGoodsArea.vue b/src/views/basicdata/warehouse/goodsArea/basicdataGoodsArea.vue
index 87a901ab..217ccb45 100644
--- a/src/views/basicdata/warehouse/goodsArea/basicdataGoodsArea.vue
+++ b/src/views/basicdata/warehouse/goodsArea/basicdataGoodsArea.vue
@@ -18,17 +18,17 @@
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
- <el-form-item label="启用状态:" prop="areaStatus">
- <!-- <el-input v-model="form.areaStatus" placeholder="请输入货区状态；1-启用，2-禁用"/>-->
- <el-select v-model="query.enableStatus" clearable placeholder="请选择启用状态" style="width: 88%;">
- <el-option
- v-for="item in enableStatus"
- :key="item.dictKey"
- :label="item.dictValue"
- :value="item.dictKey">
- </el-option>
- </el-select>
- </el-form-item>
+<!-- <el-form-item label="启用状态:" prop="areaStatus">-->
+<!-- <!– <el-input v-model="form.areaStatus" placeholder="请输入货区状态；1-启用，2-禁用"/>–>-->
+<!-- <el-select v-model="query.enableStatus" clearable placeholder="请选择启用状态" style="width: 88%;">-->
+<!-- <el-option-->
+<!-- v-for="item in enableStatus"-->
+<!-- :key="item.dictKey"-->
+<!-- :label="item.dictValue"-->
+<!-- :value="item.dictKey">-->
+<!-- </el-option>-->
+<!-- </el-select>-->
+<!-- </el-form-item>-->
<el-form-item label="货区类型:" prop="areaStatus">
<!-- <el-input v-model="form.areaStatus" placeholder="请输入货区状态；1-启用，2-禁用"/>-->
<el-select v-model="query.areaType" clearable placeholder="请选择货区类型" style="width: 88%;">
@@ -82,20 +82,20 @@
:key="index">
</el-table-column>
</template>
- <el-table-column
- prop="enableStatus"
- label="货区状态"
- align="center"
- width="150">
- <template #default="{row,$index}" >
- <el-switch
- active-color="#13ce66"
- inactive-color="#ff4949"
- v-model="row.enableState"
- @change="changeStatus($event,row,$index)">
- </el-switch>
- </template>
- </el-table-column>
+<!-- <el-table-column-->
+<!-- prop="enableStatus"-->
+<!-- label="货区状态"-->
+<!-- align="center"-->
+<!-- width="150">-->
+<!-- <template #default="{row,$index}" >-->
+<!-- <el-switch-->
+<!-- active-color="#13ce66"-->
+<!-- inactive-color="#ff4949"-->
+<!-- v-model="row.enableState"-->
+<!-- @change="changeStatus($event,row,$index)">-->
+<!-- </el-switch>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
<!-- 操作栏模块 -->
<el-table-column prop="menu" label="操作" :width="220" align="center">
<template #="{row}">
diff --git a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
index 527b8e99..22a53f82 100644
--- a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
+++ b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
@@ -23,17 +23,17 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="启用状态:" prop="areaStatus">
- <!-- <el-input v-model="form.areaStatus" placeholder="请输入货区状态；1-启用，2-禁用"/>-->
- <el-select v-model="query.enableStatus" clearable placeholder="请选择启用状态" style="width: 80%;">
- <el-option
- v-for="item in enableStatusData"
- :key="item.dictKey"
- :label="item.dictValue"
- :value="item.dictKey">
- </el-option>
- </el-select>
- </el-form-item>
+<!-- <el-form-item label="启用状态:" prop="areaStatus">-->
+<!-- <!– <el-input v-model="form.areaStatus" placeholder="请输入货区状态；1-启用，2-禁用"/>–>-->
+<!-- <el-select v-model="query.enableStatus" clearable placeholder="请选择启用状态" style="width: 80%;">-->
+<!-- <el-option-->
+<!-- v-for="item in enableStatusData"-->
+<!-- :key="item.dictKey"-->
+<!-- :label="item.dictValue"-->
+<!-- :value="item.dictKey">-->
+<!-- </el-option>-->
+<!-- </el-select>-->
+<!-- </el-form-item>-->
<el-button type="primary" icon="el-icon-search" @click="searchChange" >搜 索</el-button>
<el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
</el-col>
@@ -48,7 +48,7 @@
<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="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>
<!-- 头部右侧按钮模块 -->
diff --git a/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue b/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
index e4815f96..e56e1bfc 100644
--- a/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
+++ b/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
@@ -28,11 +28,11 @@
v-if="permission.warehouseWarehouse_delete"
@click="handleDelete">删 除
</el-button>
- <el-button type="warning"
- plain
- icon="el-icon-download"
- @click="handleExport">导 出
- </el-button>
+<!-- <el-button type="warning"-->
+<!-- plain-->
+<!-- icon="el-icon-download"-->
+<!-- @click="handleExport">导 出-->
+<!-- </el-button>-->
</template>
<!-- <template #menu="{size,row,index}">-->
<!--<!– <el-button type="primary" text icon="el-icon-view" @click="editDeline(row)">查看地图</el-button>–>-->