1.货区数量

2 years ago · dc2f5186d0
4 changed files with 138 additions and 17 deletions
--- a/src/api/basicdata/basicdataGoodsAllocation.js
+++ b/src/api/basicdata/basicdataGoodsAllocation.js
@ -31,6 +31,24 @@ export const remove = (ids) => {
    }
  })
 }
+export const disable = (ids) => {
+  return request({
+    url: '/api/logpm-basicdata/goodsAllocation/disable',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
+export const enable = (ids) => {
+  return request({
+    url: '/api/logpm-basicdata/goodsAllocation/enable',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
 export const shelf = (ids) => {
  return request({
    url: '/api/logpm-warehouse/warehouseGoodsAllocation/downAllocation',
--- a/src/option/basicdata/basicdataGoodsAllocation.js
+++ b/src/option/basicdata/basicdataGoodsAllocation.js
@ -195,6 +195,7 @@ export default {
      editDisplay: true,
      viewDisplay: true,
      hide: false,
+      search: true,
    },
    {
      label: "所在层",
@ -206,6 +207,7 @@ export default {
      editDisplay: true,
      viewDisplay: true,
      hide: false,
+      search: true,
    },
    {
      label: "启用状态",
--- a/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue
+++ b/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue
@ -24,8 +24,12 @@
        <el-button type="danger"
                   icon="el-icon-delete"
                   plain
-                   v-if="permission.BasicdataGoodsAllocation_delete"
-                   @click="handleDelete">删 除
+                   @click="handleDisable">禁 用
+        </el-button>
+        <el-button type="danger"
+                   icon="el-icon-delete"
+                   plain
+                   @click="handleEnable">启 用
        </el-button>
 <!--        <el-button type="warning"-->
 <!--                   plain-->
@ -74,7 +78,7 @@
 </template>

 <script>
-  import {getList, getDetail, add, update, remove,getPrintTemplate,shelf} from "@/api/basicdata/basicdataGoodsAllocation";
+  import {getList, getDetail, add, update, remove,getPrintTemplate,shelf,disable,enable} from "@/api/basicdata/basicdataGoodsAllocation";
  import option from "@/option/basicdata/basicdataGoodsAllocation";
  import {mapGetters} from "vuex";
  import {exportBlob} from "@/api/common";
@ -263,6 +267,50 @@
            this.$refs.crud.toggleSelection();
          });
      },
+      handleDisable() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择至少一条数据");
+          return;
+        }
+        this.$confirm("确定将选择数据禁用?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return disable(this.ids);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+            this.$refs.crud.toggleSelection();
+          });
+      },
+      handleEnable() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择至少一条数据");
+          return;
+        }
+        this.$confirm("确定将选择数据启用?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return enable(this.ids);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+            this.$refs.crud.toggleSelection();
+          });
+      },
      //批量打印数据处理代码
      printTemplate() {
        let that=this;
@ -410,11 +458,15 @@
          nodeInfo,
          enableStatus,
          allocationStatus,
+          layerNum,
+          columnNum,
        } = this.query;

          let values = {
            enableStatus:enableStatus,
-            allocationStatus:allocationStatus
+            allocationStatus:allocationStatus,
+            layerNum:layerNum,
+            columnNum:columnNum
          };
          if (!!this.query.nodeInfo){
            values.warehouseId=nodeInfo[0];
--- a/src/views/basicdata/warehouse/goodsArea/basicdataGoodsArea.vue
+++ b/src/views/basicdata/warehouse/goodsArea/basicdataGoodsArea.vue
@ -7,17 +7,6 @@
          <!-- 查询按钮 -->
          <el-form-item>
            <el-col>
-             <!-- <el-form-item label="仓库:" prop="warehouse">
-                          <el-input v-model="form.areaStatus" placeholder="请输入货区状态；1-启用，2-禁用"/>
-                <el-select v-model="query.warehouseId" filterable clearable  placeholder="请输入仓库关键词" style="width: 88%;">
-                  <el-option>
-                          v-for="item in allWarehouse"
-                          :key="item.id"
-                          :label="item.name"
-                          :value="item.id">
-                  </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%;">
@ -30,7 +19,6 @@
                </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%;">
                  <el-option
                          v-for="item in areaTypeData"
@ -53,6 +41,11 @@
          <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"
+                       plain
+                       @click="handleImport">导 入 货 区
+            </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>
@ -183,6 +176,17 @@
        </template>
      </el-dialog>
    </div>
+
+    <el-dialog title="货区导入" append-to-body v-model="excelBox" width="555px">
+      <avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter">
+        <template #excelTemplate>
+          <el-button type="primary" @click="handleTemplate">
+            点击下载<i class="el-icon-download el-icon--right"></i>
+          </el-button>
+        </template>
+      </avue-form>
+    </el-dialog>
+
  </basic-container>
 </template>

@ -201,6 +205,33 @@ import { dateNow } from '@/utils/date';
 export default {
  data () {
    return {
+      excelBox: false,
+      excelForm: {},
+      excelOption: {
+        submitBtn: false,
+        emptyBtn: false,
+        column: [
+          {
+            label: '文件上传',
+            prop: 'excelFile',
+            type: 'upload',
+            drag: true,
+            loadText: '文件上传，请稍等',
+            span: 24,
+            propsHttp: {
+              res: 'data',
+            },
+            tip: '请上传 .xls,.xlsx 标准格式文件',
+            action: '/api/logpm-basic/material/import-basicMaterial',
+          },
+          {
+            label: '模板下载',
+            prop: 'excelTemplate',
+            formslot: true,
+            span: 24,
+          },
+        ],
+      },
      columnList: [
        {
          prop: '',
@ -390,7 +421,25 @@ export default {
  methods: {
    init () {
      this.height = this.setPx(document.body.clientHeight - 340);
-
+    },
+    uploadAfter(res, done, loading, column) {
+      window.console.log(column);
+      this.excelBox = false;
+      this.refreshChange();
+      done();
+    },
+    //导出
+    handleImport(){
+      this.excelBox = true;
+    },
+    //下载模板
+    handleTemplate() {
+      console.log("下载模板！！！~~~~~~~~~~~");
+      exportBlob(
+        `/api/logpm-basicdata/goodsArea/exportmb-BasicdataGoodsArea?${this.website.tokenHeader}=${getToken()}`
+      ).then(res => {
+        downloadXls(res.data, '货区模板.xlsx');
+      });
    },
    getListInfo(){
      getDictionaryBiz( 'area_type').then(res => {