diff --git a/sgzb-ui/src/views/store/tools/safeTools.vue b/sgzb-ui/src/views/store/tools/safeTools.vue
index 522678ce..39782feb 100644
--- a/sgzb-ui/src/views/store/tools/safeTools.vue
+++ b/sgzb-ui/src/views/store/tools/safeTools.vue
@@ -1,311 +1,436 @@
 <template>
-  <div class="app-container" id="safeTools">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
-      <el-form-item label="供应商名称" prop="dictName">
-        <el-input
-            v-model="queryParams.dictName"
-            placeholder="请输入供应商名称"
-            clearable maxlength="50"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+    <div class="app-container" id="safeTools">
+        <el-form
+            :model="queryParams"
+            ref="queryForm"
+            size="small"
+            :inline="true"
+            v-show="showSearch"
+            label-width="80px"
+        >
+            <el-form-item label="供应商名称" prop="dictName">
+                <el-input
+                    v-model="queryParams.dictName"
+                    placeholder="请输入供应商名称"
+                    clearable
+                    maxlength="50"
+                    style="width: 240px"
+                    @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-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" 
-        >新增</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="['store:labelType: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="['store:labelType:remove']"-->
-      <!--        >删除</el-button>-->
-      <!--      </el-col>-->
-      <el-col :span="1.5">
-        <el-button
-            type="warning"
-            plain
-            icon="el-icon-download"
-            size="mini"
-            @click="handleExport" 
-        >导出</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-            type="danger"
-            plain
-            icon="el-icon-refresh"
-            size="mini"
-            @click="handleRefreshCache" 
-        >刷新缓存</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+        <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+                <el-button
+                    type="primary"
+                    plain
+                    icon="el-icon-plus"
+                    size="mini"
+                    @click="handleAdd"
+                    >新增</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="['store:labelType: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="['store:labelType:remove']"-->
+            <!--        >删除</el-button>-->
+            <!--      </el-col>-->
+            <el-col :span="1.5">
+                <el-button
+                    type="warning"
+                    plain
+                    icon="el-icon-download"
+                    size="mini"
+                    @click="handleExport"
+                    >导出</el-button
+                >
+            </el-col>
+            <el-col :span="1.5">
+                <el-button
+                    type="danger"
+                    plain
+                    icon="el-icon-refresh"
+                    size="mini"
+                    @click="handleRefreshCache"
+                    >刷新缓存</el-button
+                >
+            </el-col>
+            <right-toolbar
+                :showSearch.sync="showSearch"
+                @queryTable="getList"
+            ></right-toolbar>
+        </el-row>
 
-    <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" align="center" width="80" type="index" :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)">
-          <!-- <template scope="scope">
+        <el-table
+            v-loading="loading"
+            :data="typeList"
+            @selection-change="handleSelectionChange"
+        >
+            <el-table-column type="selection" width="55" align="center" />
+            <el-table-column
+                label="序号"
+                align="center"
+                width="80"
+                type="index"
+                :index="
+                    indexContinuation(queryParams.pageNum, queryParams.pageSize)
+                "
+            >
+                <!-- <template scope="scope">
           <span>{{ (queryParams.pageNum - 1) * 10 + scope.$index + 1 }}</span>
           </template> -->
-      </el-table-column>
-      <el-table-column label="工器具类型" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="规格型号" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="设备编号" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="设备状态" align="center" prop="dictName" :show-overflow-tooltip="true" />
+            </el-table-column>
+            <el-table-column
+                label="工器具类型"
+                align="center"
+                prop="dictName"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="规格型号"
+                align="center"
+                prop="dictName"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="设备编号"
+                align="center"
+                prop="dictName"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="设备状态"
+                align="center"
+                prop="dictName"
+                :show-overflow-tooltip="true"
+            />
 
-      <el-table-column label="固定资产编号" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="设备原编号" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="购置批次" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="绑定标签" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="所在仓库" align="center" prop="dictName" :show-overflow-tooltip="true" />
+            <el-table-column
+                label="固定资产编号"
+                align="center"
+                prop="dictName"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label=""
+                align="center"
+                prop="dictName"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="购置批次"
+                align="center"
+                prop="dictName"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="绑定标签"
+                align="center"
+                prop="dictName"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="所在仓库"
+                align="center"
+                prop="dictName"
+                :show-overflow-tooltip="true"
+            />
 
+            <el-table-column
+                label="操作"
+                align="center"
+                class-name="small-padding fixed-width"
+            >
+                <template slot-scope="scope">
+                    <el-button
+                        size="mini"
+                        type="primary"
+                        icon="el-icon-edit"
+                        @click="handleUpdate(scope.row)"
+                        >编辑</el-button
+                    >
+                    <el-button
+                        size="mini"
+                        type="danger"
+                        icon="el-icon-delete"
+                        @click="handleDelete(scope.row)"
+                        >删除</el-button
+                    >
+                </template>
+            </el-table-column>
+        </el-table>
 
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-              size="mini"
-              type="primary"
-              icon="el-icon-edit"
-              @click="handleUpdate(scope.row)" 
-          >编辑</el-button>
-          <el-button
-              size="mini"
-              type="danger"
-              icon="el-icon-delete"
-              @click="handleDelete(scope.row)" 
-          >删除</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"
+        />
 
-    <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="600px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-form-item label="单位类型名称" prop="dictName">
-          <el-input v-model="form.dictName" placeholder="请输入单位类型名称" maxlength="50"/>
-        </el-form-item>
-        <!--        <el-form-item label="字典类型" prop="dictType">-->
-        <!--          <el-input v-model="form.dictType" placeholder="请输入字典类型" />-->
-        <!--        </el-form-item>-->
-        <!--        <el-form-item label="状态" prop="status">-->
-        <!--          <el-radio-group v-model="form.status">-->
-        <!--            <el-radio-->
-        <!--              v-for="dict in dict.type.sys_normal_disable"-->
-        <!--              :key="dict.value"-->
-        <!--              :label="dict.value"-->
-        <!--            >{{dict.label}}</el-radio>-->
-        <!--          </el-radio-group>-->
-        <!--        </el-form-item>-->
-        <!--        <el-form-item label="备注" prop="remark">-->
-        <!--          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>-->
-        <!--        </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>
+        <!-- 添加或修改参数配置对话框 -->
+        <el-dialog
+            :title="title"
+            :visible.sync="open"
+            width="600px"
+            append-to-body
+        >
+            <el-form
+                ref="form"
+                :model="form"
+                :rules="rules"
+                label-width="120px"
+            >
+                <el-form-item label="单位类型名称" prop="dictName">
+                    <el-input
+                        v-model="form.dictName"
+                        placeholder="请输入单位类型名称"
+                        maxlength="50"
+                    />
+                </el-form-item>
+                <!--        <el-form-item label="字典类型" prop="dictType">-->
+                <!--          <el-input v-model="form.dictType" placeholder="请输入字典类型" />-->
+                <!--        </el-form-item>-->
+                <!--        <el-form-item label="状态" prop="status">-->
+                <!--          <el-radio-group v-model="form.status">-->
+                <!--            <el-radio-->
+                <!--              v-for="dict in dict.type.sys_normal_disable"-->
+                <!--              :key="dict.value"-->
+                <!--              :label="dict.value"-->
+                <!--            >{{dict.label}}</el-radio>-->
+                <!--          </el-radio-group>-->
+                <!--        </el-form-item>-->
+                <!--        <el-form-item label="备注" prop="remark">-->
+                <!--          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>-->
+                <!--        </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 { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
+import {
+    listType,
+    getType,
+    delType,
+    addType,
+    updateType,
+    refreshCache,
+} from '@/api/system/dict/type'
 
 export default {
-  name: "SafeTools",
-  dicts: ['sys_normal_disable'],
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 字典表格数据
-      typeList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 日期范围
-      dateRange: [],
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        dictName: undefined,
-        dictType: undefined,
-        status: undefined
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        dictName: [
-          { required: true, message: "字典名称不能为空", trigger: "blur" }
-        ],
-        dictType: [
-          { required: true, message: "字典类型不能为空", trigger: "blur" }
-        ]
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询字典类型列表 */
-    getList() {
-      this.loading = true;
-      listType(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-            this.typeList = response.rows;
-            this.total = response.total;
-            this.loading = false;
-          }
-      );
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        dictId: undefined,
-        dictName: undefined,
-        dictType: undefined,
-        status: "0",
-        remark: undefined
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.dateRange = [];
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加字典类型";
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.dictId)
-      this.single = selection.length!=1
-      this.multiple = !selection.length
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const dictId = row.dictId || this.ids
-      getType(dictId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改字典类型";
-      });
-    },
-    /** 提交按钮 */
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.dictId != undefined) {
-            updateType(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addType(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
+    name: 'SafeTools',
+    dicts: ['sys_normal_disable'],
+    data() {
+        return {
+            // 遮罩层
+            loading: true,
+            // 选中数组
+            ids: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 总条数
+            total: 0,
+            // 字典表格数据
+            typeList: [],
+            // 弹出层标题
+            title: '',
+            // 是否显示弹出层
+            open: false,
+            // 日期范围
+            dateRange: [],
+            // 查询参数
+            queryParams: {
+                pageNum: 1,
+                pageSize: 10,
+                dictName: undefined,
+                dictType: undefined,
+                status: undefined,
+            },
+            // 表单参数
+            form: {},
+            // 表单校验
+            rules: {
+                dictName: [
+                    {
+                        required: true,
+                        message: '字典名称不能为空',
+                        trigger: 'blur',
+                    },
+                ],
+                dictType: [
+                    {
+                        required: true,
+                        message: '字典类型不能为空',
+                        trigger: 'blur',
+                    },
+                ],
+            },
         }
-      });
     },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const dictIds = row.dictId || this.ids;
-      this.$modal.confirm('是否确认删除所选择的数据项？').then(function() {
-        return delType(dictIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+    created() {
+        this.getList()
     },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('system/dict/type/export', {
-        ...this.queryParams
-      }, `type_${new Date().getTime()}.xlsx`)
+    methods: {
+        /** 查询字典类型列表 */
+        getList() {
+            this.loading = true
+            listType(this.addDateRange(this.queryParams, this.dateRange)).then(
+                (response) => {
+                    this.typeList = response.rows
+                    this.total = response.total
+                    this.loading = false
+                },
+            )
+        },
+        // 取消按钮
+        cancel() {
+            this.open = false
+            this.reset()
+        },
+        // 表单重置
+        reset() {
+            this.form = {
+                dictId: undefined,
+                dictName: undefined,
+                dictType: undefined,
+                status: '0',
+                remark: undefined,
+            }
+            this.resetForm('form')
+        },
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageNum = 1
+            this.getList()
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.dateRange = []
+            this.resetForm('queryForm')
+            this.handleQuery()
+        },
+        /** 新增按钮操作 */
+        handleAdd() {
+            this.reset()
+            this.open = true
+            this.title = '添加字典类型'
+        },
+        // 多选框选中数据
+        handleSelectionChange(selection) {
+            this.ids = selection.map((item) => item.dictId)
+            this.single = selection.length != 1
+            this.multiple = !selection.length
+        },
+        /** 修改按钮操作 */
+        handleUpdate(row) {
+            this.reset()
+            const dictId = row.dictId || this.ids
+            getType(dictId).then((response) => {
+                this.form = response.data
+                this.open = true
+                this.title = '修改字典类型'
+            })
+        },
+        /** 提交按钮 */
+        submitForm: function () {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    if (this.form.dictId != undefined) {
+                        updateType(this.form).then((response) => {
+                            this.$modal.msgSuccess('修改成功')
+                            this.open = false
+                            this.getList()
+                        })
+                    } else {
+                        addType(this.form).then((response) => {
+                            this.$modal.msgSuccess('新增成功')
+                            this.open = false
+                            this.getList()
+                        })
+                    }
+                }
+            })
+        },
+        /** 删除按钮操作 */
+        handleDelete(row) {
+            const dictIds = row.dictId || this.ids
+            this.$modal
+                .confirm('是否确认删除所选择的数据项？')
+                .then(function () {
+                    return delType(dictIds)
+                })
+                .then(() => {
+                    this.getList()
+                    this.$modal.msgSuccess('删除成功')
+                })
+                .catch(() => {})
+        },
+        /** 导出按钮操作 */
+        handleExport() {
+            this.download(
+                'system/dict/type/export',
+                {
+                    ...this.queryParams,
+                },
+                `type_${new Date().getTime()}.xlsx`,
+            )
+        },
+        /** 刷新缓存按钮操作 */
+        handleRefreshCache() {
+            refreshCache().then(() => {
+                this.$modal.msgSuccess('刷新成功')
+                this.$store.dispatch('dict/cleanDict')
+            })
+        },
     },
-    /** 刷新缓存按钮操作 */
-    handleRefreshCache() {
-      refreshCache().then(() => {
-        this.$modal.msgSuccess("刷新成功");
-        this.$store.dispatch('dict/cleanDict');
-      });
-    }
-  }
-};
+}
 </script>
 <style lang="scss" scoped>
 ::v-deep.el-table .fixed-width .el-button--mini {
-  width: 60px !important;
-  margin-bottom: 10px;
+    width: 60px !important;
+    margin-bottom: 10px;
 }
 </style>
\ No newline at end of file
diff --git a/sgzb-ui/src/views/warehouseManage/machinery/coding/index.vue b/sgzb-ui/src/views/warehouseManage/machinery/coding/index.vue
index 3cf3229e..3be6b012 100644
--- a/sgzb-ui/src/views/warehouseManage/machinery/coding/index.vue
+++ b/sgzb-ui/src/views/warehouseManage/machinery/coding/index.vue
@@ -220,10 +220,15 @@
                     >
                 </template>
             </el-table-column>
-            <el-table-column
+            <!-- <el-table-column
                 label="IOT设备"
                 align="center"
                 prop="ownHouseName"
+            /> -->
+            <el-table-column
+                label="所在仓库"
+                align="center"
+                prop="ownHouseName"
             />
             <!--      <el-table-column label="创建时间" align="center" prop="createTime" width="180">-->
             <!--        <template slot-scope="scope">-->