From 4775ebe41e22fdc5b734702581ac99c81198925d Mon Sep 17 00:00:00 2001
From: 15066119699 <bo.wu@finesys.com.cn>
Date: Tue, 4 Mar 2025 17:09:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=BA=93=E4=BD=8D=20?=
 =?UTF-8?q?=E8=BD=BD=E5=85=B7=20=20=E6=96=B0=E5=A2=9E=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E5=92=8C=E7=89=A9=E6=96=99=E7=B1=BB=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/custom.js             |  44 +++++
 src/api/system/goodsType.js          |  44 +++++
 src/views/system/custom/index.vue    | 286 +++++++++++++++++++++++++++
 src/views/system/goodsType/index.vue | 256 ++++++++++++++++++++++++
 src/views/system/location/index.vue  | 170 ++++++++--------
 src/views/system/provider/index.vue  |  52 ++---
 src/views/system/storage/index.vue   | 130 ++++++------
 src/views/system/vehicle/index.vue   |  82 ++++----
 8 files changed, 832 insertions(+), 232 deletions(-)
 create mode 100644 src/api/system/custom.js
 create mode 100644 src/api/system/goodsType.js
 create mode 100644 src/views/system/custom/index.vue
 create mode 100644 src/views/system/goodsType/index.vue

diff --git a/src/api/system/custom.js b/src/api/system/custom.js
new file mode 100644
index 0000000..abac7d6
--- /dev/null
+++ b/src/api/system/custom.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询【请填写功能名称】列表
+export function listProvider(query) {
+  return request({
+    url: '/app/provider/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询【请填写功能名称】详细
+export function getProvider(providerId) {
+  return request({
+    url: '/app/provider/' + providerId,
+    method: 'get'
+  })
+}
+
+// 新增【请填写功能名称】
+export function addProvider(data) {
+  return request({
+    url: '/app/provider',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改【请填写功能名称】
+export function updateProvider(data) {
+  return request({
+    url: '/app/provider',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除【请填写功能名称】
+export function delProvider(providerId) {
+  return request({
+    url: '/app/provider/' + providerId,
+    method: 'delete'
+  })
+}
diff --git a/src/api/system/goodsType.js b/src/api/system/goodsType.js
new file mode 100644
index 0000000..640ea3c
--- /dev/null
+++ b/src/api/system/goodsType.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询物料类别管理列表
+export function listGoodsType(query) {
+  return request({
+    url: '/system/goodsType/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询物料类别管理详细
+export function getGoodsType(typeId) {
+  return request({
+    url: '/system/goodsType/' + typeId,
+    method: 'get'
+  })
+}
+
+// 新增物料类别管理
+export function addGoodsType(data) {
+  return request({
+    url: '/system/goodsType',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改物料类别管理
+export function updateGoodsType(data) {
+  return request({
+    url: '/system/goodsType',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除物料类别管理
+export function delGoodsType(typeId) {
+  return request({
+    url: '/system/goodsType/' + typeId,
+    method: 'delete'
+  })
+}
diff --git a/src/views/system/custom/index.vue b/src/views/system/custom/index.vue
new file mode 100644
index 0000000..cf5c8df
--- /dev/null
+++ b/src/views/system/custom/index.vue
@@ -0,0 +1,286 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="客户名称" prop="providerName">
+        <el-input
+          v-model="queryParams.providerName"
+          placeholder="请输入客户名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['app:provider:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['app:provider:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['app:provider:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['app:provider:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="providerList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="客户编码" align="center" prop="providerId" />
+      <el-table-column label="客户名称" align="center" prop="providerName" />
+      <el-table-column label="电话" align="center" prop="providerContact" />
+      <el-table-column label="地址" align="center" prop="providerAddress" />
+      <el-table-column label="状态" align="center" prop="providerStatus" />
+      <!--<el-table-column label="最近更新用户" align="center" prop="lastUpdateUser" />-->
+      <!--<el-table-column label="最近更新时间" align="center" prop="lastUpdateTime" width="180">-->
+        <!--<template slot-scope="scope">-->
+          <!--<span>{{ parseTime(scope.row.lastUpdateTime, '{y}-{m}-{d}') }}</span>-->
+        <!--</template>-->
+      <!--</el-table-column>-->
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['app:provider:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['app:provider:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改【请填写功能名称】对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="客户名称" prop="providerName">
+          <el-input v-model="form.providerName" placeholder="请输入客户名称" />
+        </el-form-item>
+        <el-form-item label="联系方式" prop="providerContact">
+          <el-input v-model="form.providerContact" placeholder="请输入联系方式" />
+        </el-form-item>
+        <el-form-item label="地址" prop="providerAddress">
+          <el-input v-model="form.providerAddress" placeholder="请输入地址" />
+        </el-form-item>
+        <el-form-item label="最近更新用户" prop="lastUpdateUser">
+          <el-input v-model="form.lastUpdateUser" placeholder="请输入最近更新用户" />
+        </el-form-item>
+        <el-form-item label="最近更新时间" prop="lastUpdateTime">
+          <el-date-picker clearable
+            v-model="form.lastUpdateTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择最近更新时间">
+          </el-date-picker>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listProvider, getProvider, delProvider, addProvider, updateProvider } from "@/api/system/custom";
+
+export default {
+  name: "Provider",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 【请填写功能名称】表格数据
+      providerList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        providerName: null,
+        providerContact: null,
+        providerAddress: null,
+        providerStatus: null,
+        providerType: 2,
+        lastUpdateUser: null,
+        lastUpdateTime: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        providerStatus: [
+          { required: true, message: "客户状态不能为空", trigger: "change" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询【请填写功能名称】列表 */
+    getList() {
+      this.loading = true;
+      listProvider(this.queryParams).then(response => {
+        this.providerList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        providerId: null,
+        providerName: null,
+        providerContact: null,
+        providerAddress: null,
+        providerStatus: 2,
+        providerType: null,
+        lastUpdateUser: null,
+        lastUpdateTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.providerId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加【请填写功能名称】";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const providerId = row.providerId || this.ids
+      getProvider(providerId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改【请填写功能名称】";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.providerId != null) {
+            updateProvider(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addProvider(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const providerIds = row.providerId || this.ids;
+      this.$modal.confirm('是否确认删除【请填写功能名称】编号为"' + providerIds + '"的数据项？').then(function() {
+        return delProvider(providerIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('app/provider/export', {
+        ...this.queryParams
+      }, `provider_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>
diff --git a/src/views/system/goodsType/index.vue b/src/views/system/goodsType/index.vue
new file mode 100644
index 0000000..647a9f9
--- /dev/null
+++ b/src/views/system/goodsType/index.vue
@@ -0,0 +1,256 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="物料类别名称" prop="typeName">
+        <el-input
+          v-model="queryParams.typeName"
+          placeholder="请输入物料类别名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+	    <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:goodsType:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="el-icon-sort"
+          size="mini"
+          @click="toggleExpandAll"
+        >展开/折叠</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-if="refreshTable"
+      v-loading="loading"
+      :data="goodsTypeList"
+      row-key="typeId"
+      :default-expand-all="isExpandAll"
+      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+    >
+      <el-table-column label="物料类别名称" prop="typeName" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:goodsType:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-plus"
+            @click="handleAdd(scope.row)"
+            v-hasPermi="['system:goodsType:add']"
+          >新增</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:goodsType:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 添加或修改物料类别管理对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="物料类别名称" prop="typeName">
+          <el-input v-model="form.typeName" placeholder="请输入物料类别名称" />
+        </el-form-item>
+        <el-form-item label="父类id" prop="parentId">
+          <treeselect v-model="form.parentId" :options="goodsTypeOptions" :normalizer="normalizer" placeholder="请选择父类id" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listGoodsType, getGoodsType, delGoodsType, addGoodsType, updateGoodsType } from "@/api/system/goodsType";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  name: "GoodsType",
+  components: {
+    Treeselect
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 物料类别管理表格数据
+      goodsTypeList: [],
+      // 物料类别管理树选项
+      goodsTypeOptions: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 是否展开，默认全部展开
+      isExpandAll: true,
+      // 重新渲染表格状态
+      refreshTable: true,
+      // 查询参数
+      queryParams: {
+        typeName: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        parentId: [
+          { required: true, message: "父类id不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询物料类别管理列表 */
+    getList() {
+      this.loading = true;
+      listGoodsType(this.queryParams).then(response => {
+        this.goodsTypeList = this.handleTree(response.data, "typeId", "parentId");
+        this.loading = false;
+      });
+    },
+    /** 转换物料类别管理数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.typeId,
+        label: node.typeName,
+        children: node.children
+      };
+    },
+	/** 查询物料类别管理下拉树结构 */
+    getTreeselect() {
+      listGoodsType().then(response => {
+        this.goodsTypeOptions = [];
+        const data = { typeId: 0, typeName: '顶级节点', children: [] };
+        data.children = this.handleTree(response.data, "typeId", "parentId");
+        this.goodsTypeOptions.push(data);
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        typeId: null,
+        typeName: null,
+        parentId: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd(row) {
+      this.reset();
+      this.getTreeselect();
+      if (row != null && row.typeId) {
+        this.form.parentId = row.typeId;
+      } else {
+        this.form.parentId = 0;
+      }
+      this.open = true;
+      this.title = "添加物料类别管理";
+    },
+    /** 展开/折叠操作 */
+    toggleExpandAll() {
+      this.refreshTable = false;
+      this.isExpandAll = !this.isExpandAll;
+      this.$nextTick(() => {
+        this.refreshTable = true;
+      });
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      this.getTreeselect();
+      if (row != null) {
+        this.form.parentId = row.parentId;
+      }
+      getGoodsType(row.typeId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改物料类别管理";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.typeId != null) {
+            updateGoodsType(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addGoodsType(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      this.$modal.confirm('是否确认删除物料类别管理编号为"' + row.typeId + '"的数据项？').then(function() {
+        return delGoodsType(row.typeId);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/src/views/system/location/index.vue b/src/views/system/location/index.vue
index 3c36611..3418b26 100644
--- a/src/views/system/location/index.vue
+++ b/src/views/system/location/index.vue
@@ -33,63 +33,63 @@
       <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="84px" :size="formSize">
         <div class="search-form-content" :class="{ 'is-advanced': isAdvanced }">
           <template v-if="isAdvanced">
-            <el-form-item label="库位号" prop="locationId">
-              <el-input
-                v-model="queryParams.locationId"
-                placeholder="请输入库位号"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>
-            <el-form-item label="库位类型" prop="locationType">
-              <el-input
-                v-model="queryParams.locationType"
-                placeholder="请输入库位类型"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>
-            <el-form-item label="库位状态" prop="locationStatus">
+            <!--<el-form-item label="库位号" prop="locationId">-->
+              <!--<el-input-->
+                <!--v-model="queryParams.locationId"-->
+                <!--placeholder="请输入库位号"-->
+                <!--clearable-->
+                <!--@keyup.enter.native="handleQuery"-->
+              <!--/>-->
+            <!--</el-form-item>-->
+            <!--<el-form-item label="库位类型" prop="locationType">-->
+              <!--<el-input-->
+                <!--v-model="queryParams.locationType"-->
+                <!--placeholder="请输入库位类型"-->
+                <!--clearable-->
+                <!--@keyup.enter.native="handleQuery"-->
+              <!--/>-->
+            <!--</el-form-item>-->
+            <el-form-item label="状态" prop="locationStatus">
               <el-input
                 v-model="queryParams.locationStatus"
-                placeholder="请输入库位状态"
+                placeholder="请输入状态"
                 clearable
                 @keyup.enter.native="handleQuery"
               />
             </el-form-item>
-            <el-form-item label="外部库位号" prop="outerId">
-              <el-input
-                v-model="queryParams.outerId"
-                placeholder="请输入外部库位号"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>
-            <el-form-item label="库区号" prop="areaId">
-              <el-input
-                v-model="queryParams.areaId"
-                placeholder="请输入库区号"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>
-            <el-form-item label="巷道号" prop="tunnelId">
-              <el-input
-                v-model="queryParams.tunnelId"
-                placeholder="请输入巷道号"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>
-            <el-form-item label="设备号" prop="equipmentId">
-              <el-input
-                v-model="queryParams.equipmentId"
-                placeholder="请输入设备号"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>
-            <el-form-item label="排" prop="wRow">
+            <!--<el-form-item label="外部库位号" prop="outerId">-->
+              <!--<el-input-->
+                <!--v-model="queryParams.outerId"-->
+                <!--placeholder="请输入外部库位号"-->
+                <!--clearable-->
+                <!--@keyup.enter.native="handleQuery"-->
+              <!--/>-->
+            <!--</el-form-item>-->
+            <!--<el-form-item label="库区号" prop="areaId">-->
+              <!--<el-input-->
+                <!--v-model="queryParams.areaId"-->
+                <!--placeholder="请输入库区号"-->
+                <!--clearable-->
+                <!--@keyup.enter.native="handleQuery"-->
+              <!--/>-->
+            <!--</el-form-item>-->
+            <!--<el-form-item label="巷道号" prop="tunnelId">-->
+              <!--<el-input-->
+                <!--v-model="queryParams.tunnelId"-->
+                <!--placeholder="请输入巷道号"-->
+                <!--clearable-->
+                <!--@keyup.enter.native="handleQuery"-->
+              <!--/>-->
+            <!--</el-form-item>-->
+            <!--<el-form-item label="设备号" prop="equipmentId">-->
+              <!--<el-input-->
+                <!--v-model="queryParams.equipmentId"-->
+                <!--placeholder="请输入设备号"-->
+                <!--clearable-->
+                <!--@keyup.enter.native="handleQuery"-->
+              <!--/>-->
+            <!--</el-form-item>-->
+            <el-form-item label="货架排" prop="wRow">
               <el-input
                 v-model="queryParams.wRow"
                 placeholder="请输入排"
@@ -97,7 +97,7 @@
                 @keyup.enter.native="handleQuery"
               />
             </el-form-item>
-            <el-form-item label="列" prop="wCol">
+            <el-form-item label="货架列" prop="wCol">
               <el-input
                 v-model="queryParams.wCol"
                 placeholder="请输入列"
@@ -105,7 +105,7 @@
                 @keyup.enter.native="handleQuery"
               />
             </el-form-item>
-            <el-form-item label="层" prop="wLayer">
+            <el-form-item label="货架层" prop="wLayer">
               <el-input
                 v-model="queryParams.wLayer"
                 placeholder="请输入层"
@@ -113,38 +113,38 @@
                 @keyup.enter.native="handleQuery"
               />
             </el-form-item>
-            <el-form-item label="深度" prop="wDepth">
-              <el-input
-                v-model="queryParams.wDepth"
-                placeholder="请输入深度"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>
-            <el-form-item label="是否锁定" prop="isLock">
-              <el-input
-                v-model="queryParams.isLock"
-                placeholder="请输入是否锁定"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>
-            <el-form-item label="载具号" prop="vehicleId">
-              <el-input
-                v-model="queryParams.vehicleId"
-                placeholder="请输入载具号"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>
-            <el-form-item label="是否正在工作" prop="isWorking">
-              <el-input
-                v-model="queryParams.isWorking"
-                placeholder="请输入是否正在工作"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>
+            <!--<el-form-item label="深度" prop="wDepth">-->
+              <!--<el-input-->
+                <!--v-model="queryParams.wDepth"-->
+                <!--placeholder="请输入深度"-->
+                <!--clearable-->
+                <!--@keyup.enter.native="handleQuery"-->
+              <!--/>-->
+            <!--</el-form-item>-->
+            <!--<el-form-item label="是否锁定" prop="isLock">-->
+              <!--<el-input-->
+                <!--v-model="queryParams.isLock"-->
+                <!--placeholder="请输入是否锁定"-->
+                <!--clearable-->
+                <!--@keyup.enter.native="handleQuery"-->
+              <!--/>-->
+            <!--</el-form-item>-->
+            <!--<el-form-item label="载具号" prop="vehicleId">-->
+              <!--<el-input-->
+                <!--v-model="queryParams.vehicleId"-->
+                <!--placeholder="请输入载具号"-->
+                <!--clearable-->
+                <!--@keyup.enter.native="handleQuery"-->
+              <!--/>-->
+            <!--</el-form-item>-->
+            <!--<el-form-item label="是否正在工作" prop="isWorking">-->
+              <!--<el-input-->
+                <!--v-model="queryParams.isWorking"-->
+                <!--placeholder="请输入是否正在工作"-->
+                <!--clearable-->
+                <!--@keyup.enter.native="handleQuery"-->
+              <!--/>-->
+            <!--</el-form-item>-->
           </template>
         </div>
         <div class="search-form-footer">
diff --git a/src/views/system/provider/index.vue b/src/views/system/provider/index.vue
index 61787b0..859d64d 100644
--- a/src/views/system/provider/index.vue
+++ b/src/views/system/provider/index.vue
@@ -9,38 +9,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="联系方式" prop="providerContact">
-        <el-input
-          v-model="queryParams.providerContact"
-          placeholder="请输入联系方式"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="地址" prop="providerAddress">
-        <el-input
-          v-model="queryParams.providerAddress"
-          placeholder="请输入地址"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="最近更新用户" prop="lastUpdateUser">
-        <el-input
-          v-model="queryParams.lastUpdateUser"
-          placeholder="请输入最近更新用户"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="最近更新时间" prop="lastUpdateTime">
-        <el-date-picker clearable
-          v-model="queryParams.lastUpdateTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择最近更新时间">
-        </el-date-picker>
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -95,17 +63,17 @@
 
     <el-table v-loading="loading" :data="providerList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="供应商id" align="center" prop="providerId" />
+      <el-table-column label="供应商编码" align="center" prop="providerId" />
       <el-table-column label="供应商名称" align="center" prop="providerName" />
-      <el-table-column label="联系方式" align="center" prop="providerContact" />
+      <el-table-column label="电话" align="center" prop="providerContact" />
       <el-table-column label="地址" align="center" prop="providerAddress" />
-      <el-table-column label="供应商状态" align="center" prop="providerStatus" />
-      <el-table-column label="最近更新用户" align="center" prop="lastUpdateUser" />
-      <el-table-column label="最近更新时间" align="center" prop="lastUpdateTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.lastUpdateTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
+      <el-table-column label="状态" align="center" prop="providerStatus" />
+      <!--<el-table-column label="最近更新用户" align="center" prop="lastUpdateUser" />-->
+      <!--<el-table-column label="最近更新时间" align="center" prop="lastUpdateTime" width="180">-->
+        <!--<template slot-scope="scope">-->
+          <!--<span>{{ parseTime(scope.row.lastUpdateTime, '{y}-{m}-{d}') }}</span>-->
+        <!--</template>-->
+      <!--</el-table-column>-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -199,6 +167,7 @@ export default {
         providerContact: null,
         providerAddress: null,
         providerStatus: null,
+        providerType: 1,
         lastUpdateUser: null,
         lastUpdateTime: null
       },
@@ -238,6 +207,7 @@ export default {
         providerContact: null,
         providerAddress: null,
         providerStatus: null,
+        providerType: 1,
         lastUpdateUser: null,
         lastUpdateTime: null
       };
diff --git a/src/views/system/storage/index.vue b/src/views/system/storage/index.vue
index 4c86490..d228665 100644
--- a/src/views/system/storage/index.vue
+++ b/src/views/system/storage/index.vue
@@ -1,38 +1,38 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="厂区" prop="factoryId">
-        <el-input
-          v-model="queryParams.factoryId"
-          placeholder="请输入厂区"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="所属部门" prop="deptId">
-        <el-input
-          v-model="queryParams.deptId"
-          placeholder="请输入所属部门"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="仓库编号" prop="storageId">
-        <el-input
-          v-model="queryParams.storageId"
-          placeholder="请输入仓库编号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="仓库简称" prop="storageShortName">
-        <el-input
-          v-model="queryParams.storageShortName"
-          placeholder="请输入仓库简称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+      <!--<el-form-item label="厂区" prop="factoryId">-->
+        <!--<el-input-->
+          <!--v-model="queryParams.factoryId"-->
+          <!--placeholder="请输入厂区"-->
+          <!--clearable-->
+          <!--@keyup.enter.native="handleQuery"-->
+        <!--/>-->
+      <!--</el-form-item>-->
+      <!--<el-form-item label="所属部门" prop="deptId">-->
+        <!--<el-input-->
+          <!--v-model="queryParams.deptId"-->
+          <!--placeholder="请输入所属部门"-->
+          <!--clearable-->
+          <!--@keyup.enter.native="handleQuery"-->
+        <!--/>-->
+      <!--</el-form-item>-->
+      <!--<el-form-item label="仓库编号" prop="storageId">-->
+        <!--<el-input-->
+          <!--v-model="queryParams.storageId"-->
+          <!--placeholder="请输入仓库编号"-->
+          <!--clearable-->
+          <!--@keyup.enter.native="handleQuery"-->
+        <!--/>-->
+      <!--</el-form-item>-->
+      <!--<el-form-item label="仓库简称" prop="storageShortName">-->
+        <!--<el-input-->
+          <!--v-model="queryParams.storageShortName"-->
+          <!--placeholder="请输入仓库简称"-->
+          <!--clearable-->
+          <!--@keyup.enter.native="handleQuery"-->
+        <!--/>-->
+      <!--</el-form-item>-->
       <el-form-item label="仓库名称" prop="storageName">
         <el-input
           v-model="queryParams.storageName"
@@ -41,38 +41,38 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="仓库地址" prop="storageAddress">
-        <el-input
-          v-model="queryParams.storageAddress"
-          placeholder="请输入仓库地址"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="仓库联系人名称" prop="storageConcatsName">
-        <el-input
-          v-model="queryParams.storageConcatsName"
-          placeholder="请输入仓库联系人名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="仓库联系人方式" prop="storageConcatsMobile">
-        <el-input
-          v-model="queryParams.storageConcatsMobile"
-          placeholder="请输入仓库联系人方式"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="是否是AGV库 0：否 1：是" prop="isAgv">
-        <el-input
-          v-model="queryParams.isAgv"
-          placeholder="请输入是否是AGV库 0：否 1：是"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+      <!--<el-form-item label="仓库地址" prop="storageAddress">-->
+        <!--<el-input-->
+          <!--v-model="queryParams.storageAddress"-->
+          <!--placeholder="请输入仓库地址"-->
+          <!--clearable-->
+          <!--@keyup.enter.native="handleQuery"-->
+        <!--/>-->
+      <!--</el-form-item>-->
+      <!--<el-form-item label="仓库联系人名称" prop="storageConcatsName">-->
+        <!--<el-input-->
+          <!--v-model="queryParams.storageConcatsName"-->
+          <!--placeholder="请输入仓库联系人名称"-->
+          <!--clearable-->
+          <!--@keyup.enter.native="handleQuery"-->
+        <!--/>-->
+      <!--</el-form-item>-->
+      <!--<el-form-item label="仓库联系人方式" prop="storageConcatsMobile">-->
+        <!--<el-input-->
+          <!--v-model="queryParams.storageConcatsMobile"-->
+          <!--placeholder="请输入仓库联系人方式"-->
+          <!--clearable-->
+          <!--@keyup.enter.native="handleQuery"-->
+        <!--/>-->
+      <!--</el-form-item>-->
+      <!--<el-form-item label="是否是AGV库 0：否 1：是" prop="isAgv">-->
+        <!--<el-input-->
+          <!--v-model="queryParams.isAgv"-->
+          <!--placeholder="请输入是否是AGV库 0：否 1：是"-->
+          <!--clearable-->
+          <!--@keyup.enter.native="handleQuery"-->
+        <!--/>-->
+      <!--</el-form-item>-->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -159,7 +159,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
diff --git a/src/views/system/vehicle/index.vue b/src/views/system/vehicle/index.vue
index 41ada28..fe314aa 100644
--- a/src/views/system/vehicle/index.vue
+++ b/src/views/system/vehicle/index.vue
@@ -1,46 +1,46 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="库位号" prop="locationId">
+      <el-form-item label="载具编码" prop="vehicleId">
         <el-input
-          v-model="queryParams.locationId"
-          placeholder="请输入库位号"
+          v-model="queryParams.vehicleId"
+          placeholder="请输入载具编码"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="是否空载具" prop="isEmpty">
+      <el-form-item label="载具类型" prop="vehicleType">
         <el-input
-          v-model="queryParams.isEmpty"
-          placeholder="请输入是否空载具"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="是否锁定" prop="isLock">
-        <el-input
-          v-model="queryParams.isLock"
-          placeholder="请输入是否锁定"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="上次入库时间" prop="lastInTime">
-        <el-date-picker clearable
-          v-model="queryParams.lastInTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择上次入库时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="上次入库用户" prop="lastInUser">
-        <el-input
-          v-model="queryParams.lastInUser"
-          placeholder="请输入上次入库用户"
+          v-model="queryParams.vehicleType"
+          placeholder="请输入载具类型"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <!--<el-form-item label="是否锁定" prop="isLock">-->
+        <!--<el-input-->
+          <!--v-model="queryParams.isLock"-->
+          <!--placeholder="请输入是否锁定"-->
+          <!--clearable-->
+          <!--@keyup.enter.native="handleQuery"-->
+        <!--/>-->
+      <!--</el-form-item>-->
+      <!--<el-form-item label="上次入库时间" prop="lastInTime">-->
+        <!--<el-date-picker clearable-->
+          <!--v-model="queryParams.lastInTime"-->
+          <!--type="date"-->
+          <!--value-format="yyyy-MM-dd"-->
+          <!--placeholder="请选择上次入库时间">-->
+        <!--</el-date-picker>-->
+      <!--</el-form-item>-->
+      <!--<el-form-item label="上次入库用户" prop="lastInUser">-->
+        <!--<el-input-->
+          <!--v-model="queryParams.lastInUser"-->
+          <!--placeholder="请输入上次入库用户"-->
+          <!--clearable-->
+          <!--@keyup.enter.native="handleQuery"-->
+        <!--/>-->
+      <!--</el-form-item>-->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -95,19 +95,19 @@
 
     <el-table v-loading="loading" :data="vehicleList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="载具号" align="center" prop="vehicleId" />
+      <el-table-column label="载具编码" align="center" prop="vehicleId" />
       <el-table-column label="载具类型" align="center" prop="vehicleType" />
-      <el-table-column label="载具状态" align="center" prop="vehicleStatus" />
-      <el-table-column label="库位号" align="center" prop="locationId" />
-      <el-table-column label="是否空载具" align="center" prop="isEmpty" />
-      <el-table-column label="是否锁定" align="center" prop="isLock" />
-      <el-table-column label="上次入库时间" align="center" prop="lastInTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.lastInTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="上次入库用户" align="center" prop="lastInUser" />
       <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="载具状态" align="center" prop="vehicleStatus" />
+      <!--<el-table-column label="库位号" align="center" prop="locationId" />-->
+      <!--<el-table-column label="是否空载具" align="center" prop="isEmpty" />-->
+      <!--<el-table-column label="是否锁定" align="center" prop="isLock" />-->
+      <!--<el-table-column label="上次入库时间" align="center" prop="lastInTime" width="180">-->
+        <!--<template slot-scope="scope">-->
+          <!--<span>{{ parseTime(scope.row.lastInTime, '{y}-{m}-{d}') }}</span>-->
+        <!--</template>-->
+      <!--</el-table-column>-->
+      <!--<el-table-column label="上次入库用户" align="center" prop="lastInUser" />-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button