diff --git a/src/api/basicdata/basicdataGoodsArea.js b/src/api/basicdata/basicdataGoodsArea.js
index a8e278bb..ff2aa322 100644
--- a/src/api/basicdata/basicdataGoodsArea.js
+++ b/src/api/basicdata/basicdataGoodsArea.js
@@ -41,6 +41,24 @@ export const remove = (ids) => {
     }
   })
 }
+export const disable = (ids) => {
+  return request({
+    url: '/api/logpm-basicdata/goodsArea/disable',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
+export const enable = (ids) => {
+  return request({
+    url: '/api/logpm-basicdata/goodsArea/enable',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
 
 export const add = (row) => {
   return request({
diff --git a/src/option/basicdata/basicdataGoodsArea.js b/src/option/basicdata/basicdataGoodsArea.js
index 4d8d94de..50ffc6e4 100644
--- a/src/option/basicdata/basicdataGoodsArea.js
+++ b/src/option/basicdata/basicdataGoodsArea.js
@@ -57,16 +57,10 @@ export default {
       label: "货区名称",
       prop: "headline",
     },
-    {
-      label: "创建人名称",
-      prop: "createUserName",
-      display: false,
-      hide: true,
-    },
     {
       label: "货区状态",
       prop: "enableStatus",
-      hide:true,
+      hide:false,
     },
     // {
     //   label: "预留1",
diff --git a/src/option/basicdata/basicdataGoodsShelf.js b/src/option/basicdata/basicdataGoodsShelf.js
index b91b32c4..9c664b36 100644
--- a/src/option/basicdata/basicdataGoodsShelf.js
+++ b/src/option/basicdata/basicdataGoodsShelf.js
@@ -117,7 +117,7 @@ export default {
     {
       label: "启用状态",
       prop: "enableStatus",
-      hide:true,
+      hide:false,
     },
     // {
     //   label: "货位名称",
diff --git a/src/views/basicdata/warehouse/goodsArea/basicdataGoodsArea.vue b/src/views/basicdata/warehouse/goodsArea/basicdataGoodsArea.vue
index 32f1e190..7945e4bc 100644
--- a/src/views/basicdata/warehouse/goodsArea/basicdataGoodsArea.vue
+++ b/src/views/basicdata/warehouse/goodsArea/basicdataGoodsArea.vue
@@ -53,6 +53,8 @@
           <div class="avue-crud__left">
             <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="handleDisable" plain>禁 用</el-button>
+            <el-button type="danger" icon="el-icon-delete" @click="handleEnable" plain>启 用</el-button>
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
@@ -102,7 +104,9 @@
               <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>
               <el-button type="primary" text icon="el-icon-view" @click="handleExport(row)">导出数据</el-button>
               <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>
-              <el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>
+              <el-button type="primary" text icon="el-icon-delete"   @click="rowDel(row)">删除</el-button>
+              <el-button type="primary" text icon="el-icon-delete" v-if="row.enableStatus=='启用'"  @click="rowDis(row)">禁用</el-button>
+              <el-button type="primary" text icon="el-icon-delete" v-if="row.enableStatus=='禁用'" @click="rowEna(row)">启用</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -209,7 +213,7 @@
 </template>
 
 <script>
-import { getList, getDetail, add, update, remove } from "@/api/basicdata/basicdataGoodsArea";
+import { getList, getDetail, add, update, remove,enable ,disable} from "@/api/basicdata/basicdataGoodsArea";
 import option from "@/option/basicdata/basicdataGoodsArea";
 import { mapGetters } from "vuex";
 import {getDictionaryBiz} from '@/api/system/dict';
@@ -279,12 +283,9 @@ export default {
   },
   created() {
     this.getListInfo();
-
-
   },
   mounted () {
     this.init();
-    this.onLoad(this.page);
   },
   computed: {
     ...mapGetters(["permission"]),
@@ -308,6 +309,7 @@ export default {
 
       getDictionaryBiz( 'enable_status').then(res => {
         this.enableStatus = res.data.data;
+        this.onLoad(this.page);
       });
       //仓库列表信息
       getWarehouseList().then(res=>{
@@ -430,7 +432,7 @@ export default {
         this.$message.warning("请选择至少一条数据");
         return;
       }
-      this.$confirm("确定将选择数据删除?", {
+      this.$confirm("确定将选择仓库删除?", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
@@ -447,6 +449,50 @@ export default {
           });
         });
     },
+    handleDisable () {
+      if (this.selectionList.length === 0) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
+      this.$confirm("确定将选择仓库禁用?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return disable(this.ids);
+        })
+        .then(() => {
+          this.selectionClear();
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        });
+    },
+    handleEnable () {
+      if (this.selectionList.length === 0) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
+      this.$confirm("确定将选择仓库启用?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return enable(this.ids);
+        })
+        .then(() => {
+          this.selectionClear();
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        });
+    },
     rowDel (row) {
       this.$confirm("确定将选择数据删除?", {
         confirmButtonText: "确定",
@@ -464,6 +510,40 @@ export default {
           });
         });
     },
+    rowDis (row) {
+      this.$confirm("确定将选择仓库禁用?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return disable(row.id);
+        })
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        });
+    },
+    rowEna (row) {
+      this.$confirm("确定将选择仓库启用?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return enable(row.id);
+        })
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        });
+    },
     beforeClose (done) {
       done()
       this.form = {};
@@ -490,25 +570,26 @@ export default {
         const data = res.data.data;
         data.records.forEach(item=>{
           //货区状态字典值回显
-          // this.enableStatus.forEach(status=>{
-          //   status.dictKey = parseInt(status.dictKey);
-          //   if (item.enableStatus === status.dictKey){
-          //     item.enableStatus = status.dictValue;
-          //   }
-          // })
-          console.log(">>>>>>>",item);
-          if (item.enableStatus===1)
-            item.enableState =true;
-            else
-              item.enableState=false;
-
-          //是否备货区区状态字典值回显
-          this.areaTypeData.forEach(areaType=>{
-            areaType.dictKey = parseInt(areaType.dictKey);
-            if (item.areaType === areaType.dictKey){
-              item.areaType = areaType.dictValue;
+          this.enableStatus.forEach(status=>{
+            if (item.enableStatus == status.dictKey){
+              item.enableStatus = status.dictValue;
             }
+            console.log("item.enableStatus>>>>>",item.enableStatus);
+            console.log(" status.dictKey>>>>>", status.dictKey);
           })
+
+          // if (item.enableStatus===1)
+          //   item.enableState =true;
+          //   else
+          //     item.enableState=false;
+
+          //是否备货区区状态字典值回显
+          // this.areaTypeData.forEach(areaType=>{
+          //   areaType.dictKey = parseInt(areaType.dictKey);
+          //   if (item.areaType === areaType.dictKey){
+          //     item.areaType = areaType.dictValue;
+          //   }
+          // })
         })
         this.page.total = data.total;
         this.data = data.records;
diff --git a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
index 13d9dba8..d3327f4c 100644
--- a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
+++ b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
@@ -51,6 +51,8 @@
           <div class="avue-crud__left">
             <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="handleDisable" plain>禁 用</el-button>
+            <el-button type="danger" icon="el-icon-delete" @click="handleEnable" 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>-->
 
@@ -105,6 +107,8 @@
               <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>
               <el-button type="primary" text icon="el-icon-edit" @click="addAllocation(row)">编 辑 货 位</el-button>
               <el-button type="primary" text icon="el-icon-edit" @click="locationList(row)">货 位 列 表</el-button>
+              <el-button type="primary" text icon="el-icon-delete" v-if="row.enableStatus=='启用'"  @click="rowDis(row)">禁用</el-button>
+              <el-button type="primary" text icon="el-icon-delete" v-if="row.enableStatus=='禁用'" @click="rowEna(row)">启用</el-button>
               <!--              <el-button type="primary" text icon="el-icon-edit" @click="enableStatus(row)">-->
               <!--                <span v-if="row.enableStatus === '启用'">禁用</span>-->
               <!--                <span v-else>启用</span>-->
@@ -144,31 +148,31 @@
           <!-- 表单字段 -->
 
           <el-row>
-            <el-col :span="12" v-if="idShowStatus && !allocation" >
-              <el-form-item label="启用状态:"  prop="enableStatus" label-width="100px" >
-                <!--            <el-input v-model="form.areaStatus" placeholder="请输入货区状态；1-启用，2-禁用"/>-->
-                <el-select v-model="form.enableStatus" clearable  placeholder="请选择货区状态"  style="width: 88%" >
-                  <el-option
-                    v-for="item in enableStatusData"
-                    :key="item.dictKey"
-                    :label="item.dictValue"
-                    :value="item.dictKey">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12"  v-if="idShowStatus && !allocation" >
-              <el-form-item label="货架状态:" prop="goodsShelfStatus" label-width="100px" >
-                <el-select v-model="form.goodsShelfStatus" clearable  placeholder="请选择货架状态"  style="width: 88%" >
-                  <el-option
-                    v-for="item in goodsShelfStatusData"
-                    :key="item.dictKey"
-                    :label="item.dictValue"
-                    :value="item.dictKey">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
+<!--            <el-col :span="12" v-if="idShowStatus && !allocation" >-->
+<!--              <el-form-item label="启用状态:"  prop="enableStatus" label-width="100px" >-->
+<!--                &lt;!&ndash;            <el-input v-model="form.areaStatus" placeholder="请输入货区状态；1-启用，2-禁用"/>&ndash;&gt;-->
+<!--                <el-select v-model="form.enableStatus" clearable  placeholder="请选择货区状态"  style="width: 88%" >-->
+<!--                  <el-option-->
+<!--                    v-for="item in enableStatusData"-->
+<!--                    :key="item.dictKey"-->
+<!--                    :label="item.dictValue"-->
+<!--                    :value="item.dictKey">-->
+<!--                  </el-option>-->
+<!--                </el-select>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--            <el-col :span="12"  v-if="idShowStatus && !allocation" >-->
+<!--              <el-form-item label="货架状态:" prop="goodsShelfStatus" label-width="100px" >-->
+<!--                <el-select v-model="form.goodsShelfStatus" clearable  placeholder="请选择货架状态"  style="width: 88%" >-->
+<!--                  <el-option-->
+<!--                    v-for="item in goodsShelfStatusData"-->
+<!--                    :key="item.dictKey"-->
+<!--                    :label="item.dictValue"-->
+<!--                    :value="item.dictKey">-->
+<!--                  </el-option>-->
+<!--                </el-select>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
             <el-col :span="12" v-if="!allocation">
               <el-form-item label="货架名称:" prop="goodsShelfName"  label-width="100px" >
                 <el-input v-model="form.goodsShelfName" placeholder="请输入货架名称" style="width: 88%;"/>
@@ -304,7 +308,7 @@ import { getList, getDetail, add, update, remove,getQRCodeImg,getShowTemplate,ge
 import {getList as allgetList,update as allupdate} from "@/api/basicdata/basicdataGoodsAllocation";
 import option from "@/option/basicdata/basicdataGoodsShelf";
 import { mapGetters } from "vuex";
-import {  getGoodsAreaNodeList } from '@/api/basicdata/basicdataGoodsArea';
+import { disable, enable, getGoodsAreaNodeList } from '@/api/basicdata/basicdataGoodsArea';
 import { getDictionaryBiz } from '@/api/system/dict';
 import { getTemplateData} from '@/api/basic/basicPrintTemplate'
 import { getLodop } from '@/utils/LodopFuncs.js'
@@ -399,7 +403,7 @@ export default {
             type: "cascader",
             labelWidth:'100',
             clearable:true,
-            placeholder:'仓库/货区/货架',
+            placeholder:'仓库/货区',
             dicUrl: '/api/logpm-basicdata/goodsAllocation/getNode',
             // dicData:dicData ,
             props: {
@@ -619,12 +623,8 @@ export default {
         this.goodsShelfStatusData = res.data.data;
       });
       getGoodsAreaNodeList().then(res=>{
-        console.log("res>>>>>>>>>>>>>>",res);
-
         const data = this.formatCascaderData(res.data.data);
-        console.log("data>>>>>>>>>>>>>>",data);
         this.optioner = data
-        console.log(">>>>>>>>>>>>>>>>optioner",this.optioner);
       })
       getTemplateData("9").then(res=>{
         console.log(res.data.data);
@@ -812,7 +812,7 @@ export default {
         this.$message.warning("请选择至少一条数据");
         return;
       }
-      this.$confirm("确定将选择数据删除?", {
+      this.$confirm("确定将选择货架删除?", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
@@ -829,6 +829,84 @@ export default {
           });
         });
     },
+    handleDisable () {
+      if (this.selectionList.length === 0) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
+      this.$confirm("确定将选择数据禁用?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return disable(this.ids);
+        })
+        .then(() => {
+          this.selectionClear();
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        });
+    },
+    handleEnable () {
+      if (this.selectionList.length === 0) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
+      this.$confirm("确定将选择货架启用?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return enable(this.ids);
+        })
+        .then(() => {
+          this.selectionClear();
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        });
+    },
+    rowDis (row) {
+      this.$confirm("确定将选择货架禁用?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return disable(row.id);
+        })
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        });
+    },
+    rowEna (row) {
+      this.$confirm("确定将选择货架启用?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return enable(row.id);
+        })
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        });
+    },
     //结合模板生成二维码
     viewQrCode(){
       if (this.selectionList.length === 0) {
@@ -968,14 +1046,14 @@ export default {
         }
         Object.assign(this.query,ids)
       }
-      getList(page.currentPage, page.pageSize, Object.assign(params, this.query )).then(res=>{
+      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res=>{
         const data = res.data.data;
         console.log(">>>>>",data);
         data.records.forEach((item,index)=>{
-          if (item.enableStatus===1){
-            item.enableState=true;
+          if (item.enableStatus==1){
+            item.enableStatus='启用';
           }else {
-            item.enableState=false;
+            item.enableStatus='禁用';
           }
           this.goodsShelfStatusData.forEach(goodsShelfStatus=>{
             if (item.goodsShelfStatus === goodsShelfStatus.sort){
diff --git a/src/views/warehouse/warehouseStock/warehouseStock.vue b/src/views/warehouse/warehouseStock/warehouseStock.vue
index d6e9f06b..f337f712 100644
--- a/src/views/warehouse/warehouseStock/warehouseStock.vue
+++ b/src/views/warehouse/warehouseStock/warehouseStock.vue
@@ -68,6 +68,17 @@ export default {
           sortable: false,
           head: false,
         },
+        {
+          prop: 'scanNodeType',
+          label: '扫描详情',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: false,
+          head: false,
+        },
         {
           prop: 'orderCode',
           label: '订单自编码',
@@ -181,7 +192,7 @@ export default {
         {
           prop: 'operatorName',
           label: '操作员',
-          type: 2,
+          type: 1,
           values: '',
           width: '180',
           checkarr: [],
@@ -373,6 +384,8 @@ export default {
     },
     inputsc(index, row) {
       console.log(index, row);
+      this.query[row.prop] = index;
+      this.onLoad(this.page);
     },
     init () {
       this.height = this.setPx(document.body.clientHeight - 340);