1.修改禁用

src/api/basicdata/basicdataGoodsShelfView.ts

@@ -31,11 +31,22 @@ export function getstoreCargo(params): Promise<AxiosResponse<VisualizationRespon
 /**
  * 更新货位状态
  */
-export function updategood(data): Promise<AxiosResponse<VisualizationResponseData>>{
+// export function updategood(data): Promise<AxiosResponse<VisualizationResponseData>>{
+//   return request({
+//     url: '/api/logpm-basicdata/goodsAllocation/disable',
+//     method: 'post',
+//     params: {
+//       data,
+//     }
+//   })
+// }
+export const disable = (ids) => {
   return request({
-    url: '/api/logpm-warehouse/warehouseGoodsAllocation/update',
+    url: '/api/logpm-basicdata/goodsAllocation/disable',
     method: 'post',
-    data
+    params: {
+      ids,
+    }
   })
 }
 /**

src/option/basicdata/basicdataTray.js

@@ -132,7 +132,7 @@ export default {
       prop: "warehouseId",
       search: true,
       type: "select",
-      dicUrl: '/api/logpm-basicdata/warehouse/warehouseList',
+      dicUrl: '/api/logpm-basicdata/warehouse/warehouseListqx',
       filterable:true,
       props: {
         label: 'name',

src/views/basicdata/team/basicdataTeamGroup.vue

@@ -4,9 +4,9 @@
       <el-row   v-if="!search" style="padding:6px 18px">
         <!-- 查询模块 -->
         <el-form :inline="true" :model="query">
-          <el-form-item label="仓库名称:">
-            <el-input v-model="query.warehouseName" placeholder="请输入仓库名称"></el-input>
-          </el-form-item>
+<!--          <el-form-item label="仓库名称:">-->
+<!--            <el-input v-model="query.warehouseName" placeholder="请输入仓库名称"></el-input>-->
+<!--          </el-form-item>-->
           <el-form-item label="班组名称:">
             <el-input v-model="query.groupName" placeholder="请输入班组名称"></el-input>
           </el-form-item>
@@ -87,18 +87,18 @@
           <el-form-item label="组名" prop="groupName">
             <el-input v-model="form.groupName" placeholder="请输入组名"/>
           </el-form-item>
-          <el-form-item label="仓库" prop="belongTo">
-<!--            <el-input v-model="form.belongTo" placeholder="请输入仓库"/>-->
-            <el-select v-model="form.belongTo" clearable placeholder="请选择仓库" style="width: 80%"  @change="clickWarehouse($event)">
-              <el-option
-                v-for="item in warehouseList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id">
-              </el-option>
-            </el-select>
+<!--          <el-form-item label="仓库" prop="belongTo">-->
+<!--&lt;!&ndash;            <el-input v-model="form.belongTo" placeholder="请输入仓库"/>&ndash;&gt;-->
+<!--            <el-select v-model="form.belongTo" clearable placeholder="请选择仓库" style="width: 80%"  @change="clickWarehouse($event)">-->
+<!--              <el-option-->
+<!--                v-for="item in warehouseList"-->
+<!--                :key="item.id"-->
+<!--                :label="item.name"-->
+<!--                :value="item.id">-->
+<!--              </el-option>-->
+<!--            </el-select>-->
 
-          </el-form-item>
+<!--          </el-form-item>-->
           <el-form-item label="班组类型" prop="groupTypes">
 <!--            <el-input v-model="form.groupType" placeholder="请输入班组类型"/>-->
             <el-select v-model="form.groupTypes" multiple  clearable placeholder="请选择班组类型" style="width: 80%">
@@ -244,7 +244,6 @@ export default {
         belongTo: [
           {  required: true, message: '请选择仓库', trigger: 'change' }
         ],
-
       }
     }
   },

src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue

@@ -211,22 +211,43 @@
         console.log(">>>>>>",row);
       },
       losses(row,mub){
-        this.$confirm('确认操作？')
-          .then(_ => {
-            row.enableStatus =mub
-            update(row).then(() => {
-              this.onLoad(this.page);
-              this.$message({
-                type: "success",
-                message: "操作成功!"
+        if (mub ==2){
+          this.$confirm('确认禁用？')
+            .then(_ => {
+              row.enableStatus =mub;
+              let id = row.id
+              disable(id).then(() => {
+                this.onLoad(this.page);
+                this.$message({
+                  type: "success",
+                  message: "操作成功!"
+                });
+              }, error => {
+                loading();
+                console.log(error);
               });
-            }, error => {
-              loading();
-              console.log(error);
+            })
+            .catch(_ => {
             });
-          })
-          .catch(_ => {
-          });
+        }else {
+          this.$confirm('确认启用？')
+            .then(_ => {
+              row.enableStatus =mub;
+              let id = row.id
+              enable(id).then(() => {
+                this.onLoad(this.page);
+                this.$message({
+                  type: "success",
+                  message: "操作成功!"
+                });
+              }, error => {
+                loading();
+                console.log(error);
+              });
+            })
+            .catch(_ => {
+            });
+        }
       },
       Offshelf(row){
         this.$confirm('确认下架？')

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

@@ -222,9 +222,10 @@ export default {
               res: 'data',
             },
             tip: '请上传 .xls,.xlsx 标准格式文件',
-            action: '/api/logpm-basic/material/import-basicMaterial',
+            action: '/api/logpm-basicdata/goodsArea/import-BasicdataGoodsArea',
           },
           {
+
             label: '模板下载',
             prop: 'excelTemplate',
             formslot: true,
@@ -275,6 +276,16 @@ export default {
           sortable: true,
           head: false,
         },
+        {
+          prop: 'areaTypeName',
+          label: '货区类型',
+          type: 2,
+          values: '',
+          width: '200',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
         {
           prop: 'cargoNub',
           label: '总货位',
@@ -423,9 +434,16 @@ export default {
       this.height = this.setPx(document.body.clientHeight - 340);
     },
     uploadAfter(res, done, loading, column) {
-      window.console.log(column);
+      console.log("res>>>>>>>",res);
+      console.log("done>>>>>>>",done);
+      console.log("loading>>>>>>>",loading);
+      console.log("column>>>>>>>",column);
+      this.$message({
+        type: 'success',
+        message: '操作成功!',
+      });
       this.excelBox = false;
-      this.refreshChange();
+
       done();
     },
     //导出

src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue

@@ -198,10 +198,10 @@
 import {
   getVisualization,
   getstoreCargo,
-  updategood,
   geturl,
   posturl,
   Alloclocationsnub,
+  disable
 } from '@/api/basicdata/basicdataGoodsShelfView';
 import { reactive, toRefs, onMounted, getCurrentInstance } from 'vue';
 const { proxy } = getCurrentInstance();
@@ -319,11 +319,13 @@ async function searchbuts() {
   }
 }
 async function upgood() {
-  let data = {
-    id: details.checkite.id,
-    enableStatus: 2,
-  };
-  let res = await updategood(data);
+  // let data = {
+  //   id: details.checkite.id,
+  //   enableStatus: 2,
+  // };
+  let id = details.checkite.id
+  console.log("goodsAllocation>>>>>>>>>",id);
+  let res = await disable(id);
   if (res.data.code == 200) {
     proxy.$message({
       type: 'success',