From dd9a959af89520dbbc7b2b1b62c0372594e3a1ad Mon Sep 17 00:00:00 2001
From: xbx <1827135378@qq.com>
Date: Sat, 18 Nov 2023 16:23:02 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=BA=90=E7=AE=A1=E7=90=861.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 HRBNU/pom.xml                                 |  32 ++
 .../modules/demo/rms/vue/RmsFurnitureList.vue | 304 ------------------
 .../demo/rms/vue/RmsFurniture_menu_insert.sql |  26 --
 .../demo/rms/vue/RmsInstrumentList.vue        | 301 -----------------
 .../rms/vue/RmsInstrument_menu_insert.sql     |  26 --
 .../modules/demo/rms/vue/RmsLocationList.vue  | 177 ----------
 .../demo/rms/vue/RmsLocation_menu_insert.sql  |  26 --
 .../demo/rms/vue/modules/RmsFurnitureForm.vue | 189 -----------
 .../RmsFurnitureModal.Style#Drawer.vue        |  84 -----
 .../rms/vue/modules/RmsFurnitureModal.vue     |  60 ----
 .../rms/vue/modules/RmsInstrumentForm.vue     | 184 -----------
 .../RmsInstrumentModal.Style#Drawer.vue       |  84 -----
 .../rms/vue/modules/RmsInstrumentModal.vue    |  60 ----
 .../demo/rms/vue/modules/RmsLocationForm.vue  | 109 -------
 .../modules/RmsLocationModal.Style#Drawer.vue |  84 -----
 .../demo/rms/vue/modules/RmsLocationModal.vue |  60 ----
 HRBNU/src/main/java/test.java                 |   5 -
 .../src/main/resources/application-dev.yml    |   2 +-
 18 files changed, 33 insertions(+), 1780 deletions(-)
 delete mode 100644 HRBNU/src/main/java/org/jeecg/modules/demo/rms/vue/RmsFurnitureList.vue
 delete mode 100644 HRBNU/src/main/java/org/jeecg/modules/demo/rms/vue/RmsFurniture_menu_insert.sql
 delete mode 100644 HRBNU/src/main/java/org/jeecg/modules/demo/rms/vue/RmsInstrumentList.vue
 delete mode 100644 HRBNU/src/main/java/org/jeecg/modules/demo/rms/vue/RmsInstrument_menu_insert.sql
 delete mode 100644 HRBNU/src/main/java/org/jeecg/modules/demo/rms/vue/RmsLocationList.vue
 delete mode 100644 HRBNU/src/main/java/org/jeecg/modules/demo/rms/vue/RmsLocation_menu_insert.sql
 delete mode 100644 HRBNU/src/main/java/org/jeecg/modules/demo/rms/vue/modules/RmsFurnitureForm.vue
 delete mode 100644 HRBNU/src/main/java/org/jeecg/modules/demo/rms/vue/modules/RmsFurnitureModal.Style#Drawer.vue
 delete mode 100644 HRBNU/src/main/java/org/jeecg/modules/demo/rms/vue/modules/RmsFurnitureModal.vue
 delete mode 100644 HRBNU/src/main/java/org/jeecg/modules/demo/rms/vue/modules/RmsInstrumentForm.vue
 delete mode 100644 HRBNU/src/main/java/org/jeecg/modules/demo/rms/vue/modules/RmsInstrumentModal.Style#Drawer.vue
 delete mode 100644 HRBNU/src/main/java/org/jeecg/modules/demo/rms/vue/modules/RmsInstrumentModal.vue
 delete mode 100644 HRBNU/src/main/java/org/jeecg/modules/demo/rms/vue/modules/RmsLocationForm.vue
 delete mode 100644 HRBNU/src/main/java/org/jeecg/modules/demo/rms/vue/modules/RmsLocationModal.Style#Drawer.vue
 delete mode 100644 HRBNU/src/main/java/org/jeecg/modules/demo/rms/vue/modules/RmsLocationModal.vue
 delete mode 100644 HRBNU/src/main/java/test.java

diff --git a/HRBNU/pom.xml b/HRBNU/pom.xml
index 83717e7..7dabb35 100644
--- a/HRBNU/pom.xml
+++ b/HRBNU/pom.xml
@@ -21,6 +21,38 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-core</artifactId>
+            <version>3.5.1</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-extension</artifactId>
+            <version>3.5.1</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-tx</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>1.5.22</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.shiro</groupId>
+            <artifactId>shiro-core</artifactId>
+            <version>1.12.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jeecgframework.boot</groupId>
+            <artifactId>jeecg-boot-base-core</artifactId>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/HRBNU/src/main/java/org/jeecg/modules/demo/rms/vue/RmsFurnitureList.vue b/HRBNU/src/main/java/org/jeecg/modules/demo/rms/vue/RmsFurnitureList.vue
deleted file mode 100644
index 6f8439d..0000000
--- a/HRBNU/src/main/java/org/jeecg/modules/demo/rms/vue/RmsFurnitureList.vue
+++ /dev/null
@@ -1,304 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-row :gutter="24">
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="领用人">
-              <j-select-user-by-dep placeholder="请选择领用人" v-model="queryParam.recipient"/>
-            </a-form-item>
-          </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="审核状态">
-              <j-dict-select-tag placeholder="请选择审核状态" v-model="queryParam.approvalStatus" dictCode="approval_status"/>
-            </a-form-item>
-          </a-col>
-          <template v-if="toggleSearchStatus">
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="初审状态">
-                <j-dict-select-tag placeholder="请选择初审状态" v-model="queryParam.initialAudit" dictCode="initial_audit"/>
-              </a-form-item>
-            </a-col>
-          </template>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
-                {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
-            </span>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-    <!-- 查询区域-END -->
-
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('家具信息表')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
-      <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
-    </div>
-
-    <!-- table区域-begin -->
-    <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
-
-      <a-table
-        ref="table"
-        size="middle"
-        :scroll="{x:true}"
-        bordered
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        class="j-table-force-nowrap"
-        @change="handleTableChange">
-
-        <template slot="htmlSlot" slot-scope="text">
-          <div v-html="text"></div>
-        </template>
-        <template slot="imgSlot" slot-scope="text,record">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
-          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
-        </template>
-        <template slot="fileSlot" slot-scope="text">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-          <a-button
-            v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadFile(text)">
-            下载
-          </a-button>
-        </template>
-
-        <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical" />
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a @click="handleDetail(record)">详情</a>
-              </a-menu-item>
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-
-      </a-table>
-    </div>
-
-    <rms-furniture-modal ref="modalForm" @ok="modalFormOk"></rms-furniture-modal>
-  </a-card>
-</template>
-
-<script>
-
-  import '@/assets/less/TableExpand.less'
-  import { mixinDevice } from '@/utils/mixin'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import RmsFurnitureModal from './modules/RmsFurnitureModal'
-  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
-
-  export default {
-    name: 'RmsFurnitureList',
-    mixins:[JeecgListMixin, mixinDevice],
-    components: {
-      RmsFurnitureModal
-    },
-    data () {
-      return {
-        description: '家具信息表管理页面',
-        // 表头
-        columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
-          {
-            title:'领用单位号',
-            align:"center",
-            dataIndex: 'collectingUnitNumber_dictText'
-          },
-          {
-            title:'家具编号',
-            align:"center",
-            dataIndex: 'furnitureNumber'
-          },
-          {
-            title:'家具名称',
-            align:"center",
-            dataIndex: 'furnitureName'
-          },
-          {
-            title:'分类号',
-            align:"center",
-            dataIndex: 'categoryId'
-          },
-          {
-            title:'型号',
-            align:"center",
-            dataIndex: 'model'
-          },
-          {
-            title:'规格',
-            align:"center",
-            dataIndex: 'specifications'
-          },
-          {
-            title:'数量',
-            align:"center",
-            dataIndex: 'number'
-          },
-          {
-            title:'单价',
-            align:"center",
-            dataIndex: 'unitPrice'
-          },
-          {
-            title:'金额',
-            align:"center",
-            dataIndex: 'amount'
-          },
-          {
-            title:'厂家',
-            align:"center",
-            dataIndex: 'manufactuer'
-          },
-          {
-            title:'购置日期',
-            align:"center",
-            dataIndex: 'purchaseDate',
-            customRender:function (text) {
-              return !text?"":(text.length>10?text.substr(0,10):text)
-            }
-          },
-          {
-            title:'领用人',
-            align:"center",
-            dataIndex: 'recipient_dictText'
-          },
-          {
-            title:'单据号',
-            align:"center",
-            dataIndex: 'documentNumber'
-          },
-          {
-            title:'存放地id',
-            align:"center",
-            dataIndex: 'locationId'
-          },
-          {
-            title:'备注',
-            align:"center",
-            dataIndex: 'note'
-          },
-          {
-            title:'审核状态',
-            align:"center",
-            dataIndex: 'approvalStatus_dictText'
-          },
-          {
-            title:'初审状态',
-            align:"center",
-            dataIndex: 'initialAudit_dictText'
-          },
-          {
-            title:'使用年限',
-            align:"center",
-            dataIndex: 'usageYears'
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            fixed:"right",
-            width:147,
-            scopedSlots: { customRender: 'action' }
-          }
-        ],
-        url: {
-          list: "/rms/rmsFurniture/list",
-          delete: "/rms/rmsFurniture/delete",
-          deleteBatch: "/rms/rmsFurniture/deleteBatch",
-          exportXlsUrl: "/rms/rmsFurniture/exportXls",
-          importExcelUrl: "rms/rmsFurniture/importExcel",
-          
-        },
-        dictOptions:{},
-        superFieldList:[],
-      }
-    },
-    created() {
-    this.getSuperFieldList();
-    },
-    computed: {
-      importExcelUrl: function(){
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-      },
-    },
-    methods: {
-      initDictConfig(){
-      },
-      getSuperFieldList(){
-        let fieldList=[];
-        fieldList.push({type:'sel_depart',value:'collectingUnitNumber',text:'领用单位号'})
-        fieldList.push({type:'string',value:'furnitureNumber',text:'家具编号',dictCode:''})
-        fieldList.push({type:'string',value:'furnitureName',text:'家具名称',dictCode:''})
-        fieldList.push({type:'string',value:'categoryId',text:'分类号',dictCode:''})
-        fieldList.push({type:'string',value:'model',text:'型号',dictCode:''})
-        fieldList.push({type:'string',value:'specifications',text:'规格',dictCode:''})
-        fieldList.push({type:'string',value:'number',text:'数量',dictCode:''})
-        fieldList.push({type:'string',value:'unitPrice',text:'单价',dictCode:''})
-        fieldList.push({type:'string',value:'amount',text:'金额',dictCode:''})
-        fieldList.push({type:'string',value:'manufactuer',text:'厂家',dictCode:''})
-        fieldList.push({type:'date',value:'purchaseDate',text:'购置日期'})
-        fieldList.push({type:'sel_user',value:'recipient',text:'领用人'})
-        fieldList.push({type:'string',value:'documentNumber',text:'单据号',dictCode:''})
-        fieldList.push({type:'string',value:'locationId',text:'存放地id',dictCode:''})
-        fieldList.push({type:'string',value:'note',text:'备注',dictCode:''})
-        fieldList.push({type:'string',value:'approvalStatus',text:'审核状态',dictCode:'approval_status'})
-        fieldList.push({type:'string',value:'initialAudit',text:'初审状态',dictCode:'initial_audit'})
-        fieldList.push({type:'string',value:'usageYears',text:'使用年限',dictCode:''})
-        this.superFieldList = fieldList
-      }
-    }
-  }
-</script>
-<style scoped>
-  @import '~@assets/less/common.less';
-</style>
\ No newline at end of file
diff --git a/HRBNU/src/main/java/org/jeecg/modules/demo/rms/vue/RmsFurniture_menu_insert.sql b/HRBNU/src/main/java/org/jeecg/modules/demo/rms/vue/RmsFurniture_menu_insert.sql
deleted file mode 100644
index 4456c1e..0000000
--- a/HRBNU/src/main/java/org/jeecg/modules/demo/rms/vue/RmsFurniture_menu_insert.sql
+++ /dev/null
@@ -1,26 +0,0 @@
--- 注意：该页面对应的前台目录为views/rms文件夹下
--- 如果你想更改到其他目录，请修改sql中component字段对应的值
-
-
-INSERT INTO sys_permission(id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, hide_tab, description, status, del_flag, rule_flag, create_by, create_time, update_by, update_time, internal_or_external) 
-VALUES ('2023111803175100140', NULL, '家具信息表', '/rms/rmsFurnitureList', 'rms/RmsFurnitureList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2023-11-18 15:17:14', NULL, NULL, 0);
-
--- 权限控制sql
--- 新增
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2023111803175100141', '2023111803175100140', '添加家具信息表', NULL, NULL, 0, NULL, NULL, 2, 'rms:rms_furniture:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-11-18 15:17:14', NULL, NULL, 0, 0, '1', 0);
--- 编辑
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2023111803175100142', '2023111803175100140', '编辑家具信息表', NULL, NULL, 0, NULL, NULL, 2, 'rms:rms_furniture:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-11-18 15:17:14', NULL, NULL, 0, 0, '1', 0);
--- 删除
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2023111803175100143', '2023111803175100140', '删除家具信息表', NULL, NULL, 0, NULL, NULL, 2, 'rms:rms_furniture:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-11-18 15:17:14', NULL, NULL, 0, 0, '1', 0);
--- 批量删除
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2023111803175100144', '2023111803175100140', '批量删除家具信息表', NULL, NULL, 0, NULL, NULL, 2, 'rms:rms_furniture:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-11-18 15:17:14', NULL, NULL, 0, 0, '1', 0);
--- 导出excel
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2023111803175100145', '2023111803175100140', '导出excel_家具信息表', NULL, NULL, 0, NULL, NULL, 2, 'rms:rms_furniture:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-11-18 15:17:14', NULL, NULL, 0, 0, '1', 0);
--- 导入excel
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2023111803175100146', '2023111803175100140', '导入excel_家具信息表', NULL, NULL, 0, NULL, NULL, 2, 'rms:rms_furniture:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-11-18 15:17:14', NULL, NULL, 0, 0, '1', 0);
\ No newline at end of file
diff --git a/HRBNU/src/main/java/org/jeecg/modules/demo/rms/vue/RmsInstrumentList.vue b/HRBNU/src/main/java/org/jeecg/modules/demo/rms/vue/RmsInstrumentList.vue
deleted file mode 100644
index 1c72d03..0000000
--- a/HRBNU/src/main/java/org/jeecg/modules/demo/rms/vue/RmsInstrumentList.vue
+++ /dev/null
@@ -1,301 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-row :gutter="24">
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="领用人">
-              <j-select-user-by-dep placeholder="请选择领用人" v-model="queryParam.recipient"/>
-            </a-form-item>
-          </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="审核状态">
-              <j-dict-select-tag placeholder="请选择审核状态" v-model="queryParam.approvalStatus" dictCode="approval_status"/>
-            </a-form-item>
-          </a-col>
-          <template v-if="toggleSearchStatus">
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="初审状态">
-                <j-dict-select-tag placeholder="请选择初审状态" v-model="queryParam.initialAudit" dictCode="initial_audit"/>
-              </a-form-item>
-            </a-col>
-          </template>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
-                {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
-            </span>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-    <!-- 查询区域-END -->
-
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('仪器信息表')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
-      <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
-    </div>
-
-    <!-- table区域-begin -->
-    <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
-
-      <a-table
-        ref="table"
-        size="middle"
-        :scroll="{x:true}"
-        bordered
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        class="j-table-force-nowrap"
-        @change="handleTableChange">
-
-        <template slot="htmlSlot" slot-scope="text">
-          <div v-html="text"></div>
-        </template>
-        <template slot="imgSlot" slot-scope="text,record">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
-          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
-        </template>
-        <template slot="fileSlot" slot-scope="text">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-          <a-button
-            v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadFile(text)">
-            下载
-          </a-button>
-        </template>
-
-        <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical" />
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a @click="handleDetail(record)">详情</a>
-              </a-menu-item>
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-
-      </a-table>
-    </div>
-
-    <rms-instrument-modal ref="modalForm" @ok="modalFormOk"></rms-instrument-modal>
-  </a-card>
-</template>
-
-<script>
-
-  import '@/assets/less/TableExpand.less'
-  import { mixinDevice } from '@/utils/mixin'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import RmsInstrumentModal from './modules/RmsInstrumentModal'
-  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
-
-  export default {
-    name: 'RmsInstrumentList',
-    mixins:[JeecgListMixin, mixinDevice],
-    components: {
-      RmsInstrumentModal
-    },
-    data () {
-      return {
-        description: '仪器信息表管理页面',
-        // 表头
-        columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
-          {
-            title:'领用单位号',
-            align:"center",
-            dataIndex: 'collectingUnitNumber_dictText'
-          },
-          {
-            title:'仪器编号',
-            align:"center",
-            dataIndex: 'instrumentNumber'
-          },
-          {
-            title:'仪器名称',
-            align:"center",
-            dataIndex: 'instrumentName'
-          },
-          {
-            title:'分类号',
-            align:"center",
-            dataIndex: 'categoryId'
-          },
-          {
-            title:'型号',
-            align:"center",
-            dataIndex: 'model'
-          },
-          {
-            title:'规格',
-            align:"center",
-            dataIndex: 'specifications'
-          },
-          {
-            title:'单价',
-            align:"center",
-            dataIndex: 'unitPrice'
-          },
-          {
-            title:'厂家',
-            align:"center",
-            dataIndex: 'manufactuer'
-          },
-          {
-            title:'购置日期',
-            align:"center",
-            dataIndex: 'purchasedate',
-            customRender:function (text) {
-              return !text?"":(text.length>10?text.substr(0,10):text)
-            }
-          },
-          {
-            title:'领用人',
-            align:"center",
-            dataIndex: 'recipient_dictText'
-          },
-          {
-            title:'入库时间',
-            align:"center",
-            dataIndex: 'entryDate',
-            customRender:function (text) {
-              return !text?"":(text.length>10?text.substr(0,10):text)
-            }
-          },
-          {
-            title:'单据号',
-            align:"center",
-            dataIndex: 'documentNumber'
-          },
-          {
-            title:'存放地id',
-            align:"center",
-            dataIndex: 'locationId'
-          },
-          {
-            title:'备注',
-            align:"center",
-            dataIndex: 'note'
-          },
-          {
-            title:'审核状态',
-            align:"center",
-            dataIndex: 'approvalStatus_dictText'
-          },
-          {
-            title:'初审状态',
-            align:"center",
-            dataIndex: 'initialAudit_dictText'
-          },
-          {
-            title:'ID',
-            align:"center",
-            dataIndex: 'instrumentId'
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            fixed:"right",
-            width:147,
-            scopedSlots: { customRender: 'action' }
-          }
-        ],
-        url: {
-          list: "/rms/rmsInstrument/list",
-          delete: "/rms/rmsInstrument/delete",
-          deleteBatch: "/rms/rmsInstrument/deleteBatch",
-          exportXlsUrl: "/rms/rmsInstrument/exportXls",
-          importExcelUrl: "rms/rmsInstrument/importExcel",
-          
-        },
-        dictOptions:{},
-        superFieldList:[],
-      }
-    },
-    created() {
-    this.getSuperFieldList();
-    },
-    computed: {
-      importExcelUrl: function(){
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-      },
-    },
-    methods: {
-      initDictConfig(){
-      },
-      getSuperFieldList(){
-        let fieldList=[];
-        fieldList.push({type:'sel_depart',value:'collectingUnitNumber',text:'领用单位号'})
-        fieldList.push({type:'string',value:'instrumentNumber',text:'仪器编号',dictCode:''})
-        fieldList.push({type:'string',value:'instrumentName',text:'仪器名称',dictCode:''})
-        fieldList.push({type:'string',value:'categoryId',text:'分类号',dictCode:''})
-        fieldList.push({type:'string',value:'model',text:'型号',dictCode:''})
-        fieldList.push({type:'string',value:'specifications',text:'规格',dictCode:''})
-        fieldList.push({type:'string',value:'unitPrice',text:'单价',dictCode:''})
-        fieldList.push({type:'string',value:'manufactuer',text:'厂家',dictCode:''})
-        fieldList.push({type:'date',value:'purchasedate',text:'购置日期'})
-        fieldList.push({type:'sel_user',value:'recipient',text:'领用人'})
-        fieldList.push({type:'date',value:'entryDate',text:'入库时间'})
-        fieldList.push({type:'string',value:'documentNumber',text:'单据号',dictCode:''})
-        fieldList.push({type:'string',value:'locationId',text:'存放地id',dictCode:''})
-        fieldList.push({type:'string',value:'note',text:'备注',dictCode:''})
-        fieldList.push({type:'string',value:'approvalStatus',text:'审核状态',dictCode:'approval_status'})
-        fieldList.push({type:'string',value:'initialAudit',text:'初审状态',dictCode:'initial_audit'})
-        fieldList.push({type:'string',value:'instrumentId',text:'ID',dictCode:''})
-        this.superFieldList = fieldList
-      }
-    }
-  }
-</script>
-<style scoped>
-  @import '~@assets/less/common.less';
-</style>
\ No newline at end of file
diff --git a/HRBNU/src/main/java/org/jeecg/modules/demo/rms/vue/RmsInstrument_menu_insert.sql b/HRBNU/src/main/java/org/jeecg/modules/demo/rms/vue/RmsInstrument_menu_insert.sql
deleted file mode 100644
index 1290d27..0000000
--- a/HRBNU/src/main/java/org/jeecg/modules/demo/rms/vue/RmsInstrument_menu_insert.sql
+++ /dev/null
@@ -1,26 +0,0 @@
--- 注意：该页面对应的前台目录为views/rms文件夹下
--- 如果你想更改到其他目录，请修改sql中component字段对应的值
-
-
-INSERT INTO sys_permission(id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, hide_tab, description, status, del_flag, rule_flag, create_by, create_time, update_by, update_time, internal_or_external) 
-VALUES ('2023111803175840210', NULL, '仪器信息表', '/rms/rmsInstrumentList', 'rms/RmsInstrumentList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2023-11-18 15:17:21', NULL, NULL, 0);
-
--- 权限控制sql
--- 新增
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2023111803175850211', '2023111803175840210', '添加仪器信息表', NULL, NULL, 0, NULL, NULL, 2, 'rms:rms_instrument:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-11-18 15:17:21', NULL, NULL, 0, 0, '1', 0);
--- 编辑
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2023111803175850212', '2023111803175840210', '编辑仪器信息表', NULL, NULL, 0, NULL, NULL, 2, 'rms:rms_instrument:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-11-18 15:17:21', NULL, NULL, 0, 0, '1', 0);
--- 删除
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2023111803175850213', '2023111803175840210', '删除仪器信息表', NULL, NULL, 0, NULL, NULL, 2, 'rms:rms_instrument:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-11-18 15:17:21', NULL, NULL, 0, 0, '1', 0);
--- 批量删除
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2023111803175850214', '2023111803175840210', '批量删除仪器信息表', NULL, NULL, 0, NULL, NULL, 2, 'rms:rms_instrument:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-11-18 15:17:21', NULL, NULL, 0, 0, '1', 0);
--- 导出excel
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2023111803175850215', '2023111803175840210', '导出excel_仪器信息表', NULL, NULL, 0, NULL, NULL, 2, 'rms:rms_instrument:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-11-18 15:17:21', NULL, NULL, 0, 0, '1', 0);
--- 导入excel
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2023111803175850216', '2023111803175840210', '导入excel_仪器信息表', NULL, NULL, 0, NULL, NULL, 2, 'rms:rms_instrument:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-11-18 15:17:21', NULL, NULL, 0, 0, '1', 0);
\ No newline at end of file
diff --git a/HRBNU/src/main/java/org/jeecg/modules/demo/rms/vue/RmsLocationList.vue b/HRBNU/src/main/java/org/jeecg/modules/demo/rms/vue/RmsLocationList.vue
deleted file mode 100644
index 7bb7ce3..0000000
--- a/HRBNU/src/main/java/org/jeecg/modules/demo/rms/vue/RmsLocationList.vue
+++ /dev/null
@@ -1,177 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-row :gutter="24">
-        </a-row>
-      </a-form>
-    </div>
-    <!-- 查询区域-END -->
-
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('存放地表')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
-      <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
-    </div>
-
-    <!-- table区域-begin -->
-    <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
-
-      <a-table
-        ref="table"
-        size="middle"
-        :scroll="{x:true}"
-        bordered
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        class="j-table-force-nowrap"
-        @change="handleTableChange">
-
-        <template slot="htmlSlot" slot-scope="text">
-          <div v-html="text"></div>
-        </template>
-        <template slot="imgSlot" slot-scope="text,record">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
-          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
-        </template>
-        <template slot="fileSlot" slot-scope="text">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-          <a-button
-            v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadFile(text)">
-            下载
-          </a-button>
-        </template>
-
-        <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical" />
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a @click="handleDetail(record)">详情</a>
-              </a-menu-item>
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-
-      </a-table>
-    </div>
-
-    <rms-location-modal ref="modalForm" @ok="modalFormOk"></rms-location-modal>
-  </a-card>
-</template>
-
-<script>
-
-  import '@/assets/less/TableExpand.less'
-  import { mixinDevice } from '@/utils/mixin'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import RmsLocationModal from './modules/RmsLocationModal'
-
-  export default {
-    name: 'RmsLocationList',
-    mixins:[JeecgListMixin, mixinDevice],
-    components: {
-      RmsLocationModal
-    },
-    data () {
-      return {
-        description: '存放地表管理页面',
-        // 表头
-        columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
-          {
-            title:'存放地id',
-            align:"center",
-            dataIndex: 'locationId'
-          },
-          {
-            title:'存放地名称',
-            align:"center",
-            dataIndex: 'locationName'
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            fixed:"right",
-            width:147,
-            scopedSlots: { customRender: 'action' }
-          }
-        ],
-        url: {
-          list: "/rms/rmsLocation/list",
-          delete: "/rms/rmsLocation/delete",
-          deleteBatch: "/rms/rmsLocation/deleteBatch",
-          exportXlsUrl: "/rms/rmsLocation/exportXls",
-          importExcelUrl: "rms/rmsLocation/importExcel",
-          
-        },
-        dictOptions:{},
-        superFieldList:[],
-      }
-    },
-    created() {
-    this.getSuperFieldList();
-    },
-    computed: {
-      importExcelUrl: function(){
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-      },
-    },
-    methods: {
-      initDictConfig(){
-      },
-      getSuperFieldList(){
-        let fieldList=[];
-        fieldList.push({type:'string',value:'locationId',text:'存放地id',dictCode:''})
-        fieldList.push({type:'string',value:'locationName',text:'存放地名称',dictCode:''})
-        this.superFieldList = fieldList
-      }
-    }
-  }
-</script>
-<style scoped>
-  @import '~@assets/less/common.less';
-</style>
\ No newline at end of file
diff --git a/HRBNU/src/main/java/org/jeecg/modules/demo/rms/vue/RmsLocation_menu_insert.sql b/HRBNU/src/main/java/org/jeecg/modules/demo/rms/vue/RmsLocation_menu_insert.sql
deleted file mode 100644
index 66a1403..0000000
--- a/HRBNU/src/main/java/org/jeecg/modules/demo/rms/vue/RmsLocation_menu_insert.sql
+++ /dev/null
@@ -1,26 +0,0 @@
--- 注意：该页面对应的前台目录为views/rms文件夹下
--- 如果你想更改到其他目录，请修改sql中component字段对应的值
-
-
-INSERT INTO sys_permission(id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, hide_tab, description, status, del_flag, rule_flag, create_by, create_time, update_by, update_time, internal_or_external) 
-VALUES ('2023111801036480250', NULL, '存放地表', '/rms/rmsLocationList', 'rms/RmsLocationList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2023-11-18 13:03:25', NULL, NULL, 0);
-
--- 权限控制sql
--- 新增
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2023111801036480251', '2023111801036480250', '添加存放地表', NULL, NULL, 0, NULL, NULL, 2, 'rms:rms_location:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-11-18 13:03:25', NULL, NULL, 0, 0, '1', 0);
--- 编辑
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2023111801036480252', '2023111801036480250', '编辑存放地表', NULL, NULL, 0, NULL, NULL, 2, 'rms:rms_location:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-11-18 13:03:25', NULL, NULL, 0, 0, '1', 0);
--- 删除
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2023111801036480253', '2023111801036480250', '删除存放地表', NULL, NULL, 0, NULL, NULL, 2, 'rms:rms_location:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-11-18 13:03:25', NULL, NULL, 0, 0, '1', 0);
--- 批量删除
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2023111801036480254', '2023111801036480250', '批量删除存放地表', NULL, NULL, 0, NULL, NULL, 2, 'rms:rms_location:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-11-18 13:03:25', NULL, NULL, 0, 0, '1', 0);
--- 导出excel
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2023111801036480255', '2023111801036480250', '导出excel_存放地表', NULL, NULL, 0, NULL, NULL, 2, 'rms:rms_location:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-11-18 13:03:25', NULL, NULL, 0, 0, '1', 0);
--- 导入excel
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2023111801036480256', '2023111801036480250', '导入excel_存放地表', NULL, NULL, 0, NULL, NULL, 2, 'rms:rms_location:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-11-18 13:03:25', NULL, NULL, 0, 0, '1', 0);
\ No newline at end of file
diff --git a/HRBNU/src/main/java/org/jeecg/modules/demo/rms/vue/modules/RmsFurnitureForm.vue b/HRBNU/src/main/java/org/jeecg/modules/demo/rms/vue/modules/RmsFurnitureForm.vue
deleted file mode 100644
index 2f38862..0000000
--- a/HRBNU/src/main/java/org/jeecg/modules/demo/rms/vue/modules/RmsFurnitureForm.vue
+++ /dev/null
@@ -1,189 +0,0 @@
-<template>
-  <a-spin :spinning="confirmLoading">
-    <j-form-container :disabled="formDisabled">
-      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
-        <a-row>
-          <a-col :span="24">
-            <a-form-model-item label="领用单位号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="collectingUnitNumber">
-              <j-select-depart v-model="model.collectingUnitNumber" :multi="true"  />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="家具编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="furnitureNumber">
-              <a-input v-model="model.furnitureNumber" placeholder="请输入家具编号"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="家具名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="furnitureName">
-              <a-input v-model="model.furnitureName" placeholder="请输入家具名称"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="分类号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="categoryId">
-              <a-input v-model="model.categoryId" placeholder="请输入分类号"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="型号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="model">
-              <a-input v-model="model.model" placeholder="请输入型号"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="规格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="specifications">
-              <a-input v-model="model.specifications" placeholder="请输入规格"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="number">
-              <a-input v-model="model.number" placeholder="请输入数量"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="单价" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="unitPrice">
-              <a-input v-model="model.unitPrice" placeholder="请输入单价"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="amount">
-              <a-input v-model="model.amount" placeholder="请输入金额"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="厂家" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="manufactuer">
-              <a-input v-model="model.manufactuer" placeholder="请输入厂家"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="购置日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="purchaseDate">
-              <j-date placeholder="请选择购置日期" v-model="model.purchaseDate"  style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="领用人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="recipient">
-              <j-select-user-by-dep v-model="model.recipient" :multi="true" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="单据号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="documentNumber">
-              <a-input v-model="model.documentNumber" placeholder="请输入单据号"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="存放地id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="locationId">
-              <a-input v-model="model.locationId" placeholder="请输入存放地id"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="note">
-              <a-input v-model="model.note" placeholder="请输入备注"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="审核状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="approvalStatus">
-              <j-dict-select-tag type="radio" v-model="model.approvalStatus" dictCode="approval_status" placeholder="请选择审核状态" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="初审状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="initialAudit">
-              <j-dict-select-tag type="radio" v-model="model.initialAudit" dictCode="initial_audit" placeholder="请选择初审状态" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="使用年限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="usageYears">
-              <a-input v-model="model.usageYears" placeholder="请输入使用年限"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-        </a-row>
-      </a-form-model>
-    </j-form-container>
-  </a-spin>
-</template>
-
-<script>
-
-  import { httpAction, getAction } from '@/api/manage'
-  import { validateDuplicateValue } from '@/utils/util'
-
-  export default {
-    name: 'RmsFurnitureForm',
-    components: {
-    },
-    props: {
-      //表单禁用
-      disabled: {
-        type: Boolean,
-        default: false,
-        required: false
-      }
-    },
-    data () {
-      return {
-        model:{
-         },
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 },
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
-        },
-        confirmLoading: false,
-        validatorRules: {
-        },
-        url: {
-          add: "/rms/rmsFurniture/add",
-          edit: "/rms/rmsFurniture/edit",
-          queryById: "/rms/rmsFurniture/queryById"
-        }
-      }
-    },
-    computed: {
-      formDisabled(){
-        return this.disabled
-      },
-    },
-    created () {
-       //备份model原始值
-      this.modelDefault = JSON.parse(JSON.stringify(this.model));
-    },
-    methods: {
-      add () {
-        this.edit(this.modelDefault);
-      },
-      edit (record) {
-        this.model = Object.assign({}, record);
-        this.visible = true;
-      },
-      submitForm () {
-        const that = this;
-        // 触发表单验证
-        this.$refs.form.validate(valid => {
-          if (valid) {
-            that.confirmLoading = true;
-            let httpurl = '';
-            let method = '';
-            if(!this.model.id){
-              httpurl+=this.url.add;
-              method = 'post';
-            }else{
-              httpurl+=this.url.edit;
-               method = 'put';
-            }
-            httpAction(httpurl,this.model,method).then((res)=>{
-              if(res.success){
-                that.$message.success(res.message);
-                that.$emit('ok');
-              }else{
-                that.$message.warning(res.message);
-              }
-            }).finally(() => {
-              that.confirmLoading = false;
-            })
-          }
-         
-        })
-      },
-    }
-  }
-</script>
\ No newline at end of file
diff --git a/HRBNU/src/main/java/org/jeecg/modules/demo/rms/vue/modules/RmsFurnitureModal.Style#Drawer.vue b/HRBNU/src/main/java/org/jeecg/modules/demo/rms/vue/modules/RmsFurnitureModal.Style#Drawer.vue
deleted file mode 100644
index 3d115d9..0000000
--- a/HRBNU/src/main/java/org/jeecg/modules/demo/rms/vue/modules/RmsFurnitureModal.Style#Drawer.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<template>
-  <a-drawer
-    :title="title"
-    :width="width"
-    placement="right"
-    :closable="false"
-    @close="close"
-    destroyOnClose
-    :visible="visible">
-    <rms-furniture-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></rms-furniture-form>
-    <div class="drawer-footer">
-      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
-      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
-    </div>
-  </a-drawer>
-</template>
-
-<script>
-
-  import RmsFurnitureForm from './RmsFurnitureForm'
-
-  export default {
-    name: 'RmsFurnitureModal',
-    components: {
-      RmsFurnitureForm
-    },
-    data () {
-      return {
-        title:"操作",
-        width:800,
-        visible: false,
-        disableSubmit: false
-      }
-    },
-    methods: {
-      add () {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.add();
-        })
-      },
-      edit (record) {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.edit(record);
-        });
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      submitCallback(){
-        this.$emit('ok');
-        this.visible = false;
-      },
-      handleOk () {
-        this.$refs.realForm.submitForm();
-      },
-      handleCancel () {
-        this.close()
-      }
-    }
-  }
-</script>
-
-<style lang="less" scoped>
-/** Button按钮间距 */
-  .ant-btn {
-    margin-left: 30px;
-    margin-bottom: 30px;
-    float: right;
-  }
-  .drawer-footer{
-    position: absolute;
-    bottom: -8px;
-    width: 100%;
-    border-top: 1px solid #e8e8e8;
-    padding: 10px 16px;
-    text-align: right;
-    left: 0;
-    background: #fff;
-    border-radius: 0 0 2px 2px;
-  }
-</style>
\ No newline at end of file
diff --git a/HRBNU/src/main/java/org/jeecg/modules/demo/rms/vue/modules/RmsFurnitureModal.vue b/HRBNU/src/main/java/org/jeecg/modules/demo/rms/vue/modules/RmsFurnitureModal.vue
deleted file mode 100644
index e09567a..0000000
--- a/HRBNU/src/main/java/org/jeecg/modules/demo/rms/vue/modules/RmsFurnitureModal.vue
+++ /dev/null
@@ -1,60 +0,0 @@
-<template>
-  <j-modal
-    :title="title"
-    :width="width"
-    :visible="visible"
-    switchFullscreen
-    @ok="handleOk"
-    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
-    @cancel="handleCancel"
-    cancelText="关闭">
-    <rms-furniture-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></rms-furniture-form>
-  </j-modal>
-</template>
-
-<script>
-
-  import RmsFurnitureForm from './RmsFurnitureForm'
-  export default {
-    name: 'RmsFurnitureModal',
-    components: {
-      RmsFurnitureForm
-    },
-    data () {
-      return {
-        title:'',
-        width:800,
-        visible: false,
-        disableSubmit: false
-      }
-    },
-    methods: {
-      add () {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.add();
-        })
-      },
-      edit (record) {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.edit(record);
-        })
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      handleOk () {
-        this.$refs.realForm.submitForm();
-      },
-      submitCallback(){
-        this.$emit('ok');
-        this.visible = false;
-      },
-      handleCancel () {
-        this.close()
-      }
-    }
-  }
-</script>
\ No newline at end of file
diff --git a/HRBNU/src/main/java/org/jeecg/modules/demo/rms/vue/modules/RmsInstrumentForm.vue b/HRBNU/src/main/java/org/jeecg/modules/demo/rms/vue/modules/RmsInstrumentForm.vue
deleted file mode 100644
index 831855c..0000000
--- a/HRBNU/src/main/java/org/jeecg/modules/demo/rms/vue/modules/RmsInstrumentForm.vue
+++ /dev/null
@@ -1,184 +0,0 @@
-<template>
-  <a-spin :spinning="confirmLoading">
-    <j-form-container :disabled="formDisabled">
-      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
-        <a-row>
-          <a-col :span="24">
-            <a-form-model-item label="领用单位号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="collectingUnitNumber">
-              <j-select-depart v-model="model.collectingUnitNumber" :multi="true"  />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="仪器编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="instrumentNumber">
-              <a-input v-model="model.instrumentNumber" placeholder="请输入仪器编号"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="仪器名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="instrumentName">
-              <a-input v-model="model.instrumentName" placeholder="请输入仪器名称"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="分类号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="categoryId">
-              <a-input v-model="model.categoryId" placeholder="请输入分类号"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="型号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="model">
-              <a-input v-model="model.model" placeholder="请输入型号"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="规格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="specifications">
-              <a-input v-model="model.specifications" placeholder="请输入规格"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="单价" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="unitPrice">
-              <a-input v-model="model.unitPrice" placeholder="请输入单价"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="厂家" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="manufactuer">
-              <a-input v-model="model.manufactuer" placeholder="请输入厂家"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="购置日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="purchasedate">
-              <j-date placeholder="请选择购置日期" v-model="model.purchasedate"  style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="领用人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="recipient">
-              <j-select-user-by-dep v-model="model.recipient" :multi="true" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="入库时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="entryDate">
-              <j-date placeholder="请选择入库时间" v-model="model.entryDate"  style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="单据号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="documentNumber">
-              <a-input v-model="model.documentNumber" placeholder="请输入单据号"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="存放地id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="locationId">
-              <a-input v-model="model.locationId" placeholder="请输入存放地id"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="note">
-              <a-input v-model="model.note" placeholder="请输入备注"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="审核状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="approvalStatus">
-              <j-dict-select-tag type="radio" v-model="model.approvalStatus" dictCode="approval_status" placeholder="请选择审核状态" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="初审状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="initialAudit">
-              <j-dict-select-tag type="radio" v-model="model.initialAudit" dictCode="initial_audit" placeholder="请选择初审状态" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="ID" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="instrumentId">
-              <a-input v-model="model.instrumentId" placeholder="请输入ID"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-        </a-row>
-      </a-form-model>
-    </j-form-container>
-  </a-spin>
-</template>
-
-<script>
-
-  import { httpAction, getAction } from '@/api/manage'
-  import { validateDuplicateValue } from '@/utils/util'
-
-  export default {
-    name: 'RmsInstrumentForm',
-    components: {
-    },
-    props: {
-      //表单禁用
-      disabled: {
-        type: Boolean,
-        default: false,
-        required: false
-      }
-    },
-    data () {
-      return {
-        model:{
-         },
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 },
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
-        },
-        confirmLoading: false,
-        validatorRules: {
-        },
-        url: {
-          add: "/rms/rmsInstrument/add",
-          edit: "/rms/rmsInstrument/edit",
-          queryById: "/rms/rmsInstrument/queryById"
-        }
-      }
-    },
-    computed: {
-      formDisabled(){
-        return this.disabled
-      },
-    },
-    created () {
-       //备份model原始值
-      this.modelDefault = JSON.parse(JSON.stringify(this.model));
-    },
-    methods: {
-      add () {
-        this.edit(this.modelDefault);
-      },
-      edit (record) {
-        this.model = Object.assign({}, record);
-        this.visible = true;
-      },
-      submitForm () {
-        const that = this;
-        // 触发表单验证
-        this.$refs.form.validate(valid => {
-          if (valid) {
-            that.confirmLoading = true;
-            let httpurl = '';
-            let method = '';
-            if(!this.model.id){
-              httpurl+=this.url.add;
-              method = 'post';
-            }else{
-              httpurl+=this.url.edit;
-               method = 'put';
-            }
-            httpAction(httpurl,this.model,method).then((res)=>{
-              if(res.success){
-                that.$message.success(res.message);
-                that.$emit('ok');
-              }else{
-                that.$message.warning(res.message);
-              }
-            }).finally(() => {
-              that.confirmLoading = false;
-            })
-          }
-         
-        })
-      },
-    }
-  }
-</script>
\ No newline at end of file
diff --git a/HRBNU/src/main/java/org/jeecg/modules/demo/rms/vue/modules/RmsInstrumentModal.Style#Drawer.vue b/HRBNU/src/main/java/org/jeecg/modules/demo/rms/vue/modules/RmsInstrumentModal.Style#Drawer.vue
deleted file mode 100644
index 0c4f142..0000000
--- a/HRBNU/src/main/java/org/jeecg/modules/demo/rms/vue/modules/RmsInstrumentModal.Style#Drawer.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<template>
-  <a-drawer
-    :title="title"
-    :width="width"
-    placement="right"
-    :closable="false"
-    @close="close"
-    destroyOnClose
-    :visible="visible">
-    <rms-instrument-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></rms-instrument-form>
-    <div class="drawer-footer">
-      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
-      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
-    </div>
-  </a-drawer>
-</template>
-
-<script>
-
-  import RmsInstrumentForm from './RmsInstrumentForm'
-
-  export default {
-    name: 'RmsInstrumentModal',
-    components: {
-      RmsInstrumentForm
-    },
-    data () {
-      return {
-        title:"操作",
-        width:800,
-        visible: false,
-        disableSubmit: false
-      }
-    },
-    methods: {
-      add () {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.add();
-        })
-      },
-      edit (record) {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.edit(record);
-        });
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      submitCallback(){
-        this.$emit('ok');
-        this.visible = false;
-      },
-      handleOk () {
-        this.$refs.realForm.submitForm();
-      },
-      handleCancel () {
-        this.close()
-      }
-    }
-  }
-</script>
-
-<style lang="less" scoped>
-/** Button按钮间距 */
-  .ant-btn {
-    margin-left: 30px;
-    margin-bottom: 30px;
-    float: right;
-  }
-  .drawer-footer{
-    position: absolute;
-    bottom: -8px;
-    width: 100%;
-    border-top: 1px solid #e8e8e8;
-    padding: 10px 16px;
-    text-align: right;
-    left: 0;
-    background: #fff;
-    border-radius: 0 0 2px 2px;
-  }
-</style>
\ No newline at end of file
diff --git a/HRBNU/src/main/java/org/jeecg/modules/demo/rms/vue/modules/RmsInstrumentModal.vue b/HRBNU/src/main/java/org/jeecg/modules/demo/rms/vue/modules/RmsInstrumentModal.vue
deleted file mode 100644
index 249fa0d..0000000
--- a/HRBNU/src/main/java/org/jeecg/modules/demo/rms/vue/modules/RmsInstrumentModal.vue
+++ /dev/null
@@ -1,60 +0,0 @@
-<template>
-  <j-modal
-    :title="title"
-    :width="width"
-    :visible="visible"
-    switchFullscreen
-    @ok="handleOk"
-    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
-    @cancel="handleCancel"
-    cancelText="关闭">
-    <rms-instrument-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></rms-instrument-form>
-  </j-modal>
-</template>
-
-<script>
-
-  import RmsInstrumentForm from './RmsInstrumentForm'
-  export default {
-    name: 'RmsInstrumentModal',
-    components: {
-      RmsInstrumentForm
-    },
-    data () {
-      return {
-        title:'',
-        width:800,
-        visible: false,
-        disableSubmit: false
-      }
-    },
-    methods: {
-      add () {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.add();
-        })
-      },
-      edit (record) {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.edit(record);
-        })
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      handleOk () {
-        this.$refs.realForm.submitForm();
-      },
-      submitCallback(){
-        this.$emit('ok');
-        this.visible = false;
-      },
-      handleCancel () {
-        this.close()
-      }
-    }
-  }
-</script>
\ No newline at end of file
diff --git a/HRBNU/src/main/java/org/jeecg/modules/demo/rms/vue/modules/RmsLocationForm.vue b/HRBNU/src/main/java/org/jeecg/modules/demo/rms/vue/modules/RmsLocationForm.vue
deleted file mode 100644
index 1be9d14..0000000
--- a/HRBNU/src/main/java/org/jeecg/modules/demo/rms/vue/modules/RmsLocationForm.vue
+++ /dev/null
@@ -1,109 +0,0 @@
-<template>
-  <a-spin :spinning="confirmLoading">
-    <j-form-container :disabled="formDisabled">
-      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
-        <a-row>
-          <a-col :span="24">
-            <a-form-model-item label="存放地id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="locationId">
-              <a-input v-model="model.locationId" placeholder="请输入存放地id"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="存放地名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="locationName">
-              <a-input v-model="model.locationName" placeholder="请输入存放地名称"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-        </a-row>
-      </a-form-model>
-    </j-form-container>
-  </a-spin>
-</template>
-
-<script>
-
-  import { httpAction, getAction } from '@/api/manage'
-  import { validateDuplicateValue } from '@/utils/util'
-
-  export default {
-    name: 'RmsLocationForm',
-    components: {
-    },
-    props: {
-      //表单禁用
-      disabled: {
-        type: Boolean,
-        default: false,
-        required: false
-      }
-    },
-    data () {
-      return {
-        model:{
-         },
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 },
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
-        },
-        confirmLoading: false,
-        validatorRules: {
-        },
-        url: {
-          add: "/rms/rmsLocation/add",
-          edit: "/rms/rmsLocation/edit",
-          queryById: "/rms/rmsLocation/queryById"
-        }
-      }
-    },
-    computed: {
-      formDisabled(){
-        return this.disabled
-      },
-    },
-    created () {
-       //备份model原始值
-      this.modelDefault = JSON.parse(JSON.stringify(this.model));
-    },
-    methods: {
-      add () {
-        this.edit(this.modelDefault);
-      },
-      edit (record) {
-        this.model = Object.assign({}, record);
-        this.visible = true;
-      },
-      submitForm () {
-        const that = this;
-        // 触发表单验证
-        this.$refs.form.validate(valid => {
-          if (valid) {
-            that.confirmLoading = true;
-            let httpurl = '';
-            let method = '';
-            if(!this.model.id){
-              httpurl+=this.url.add;
-              method = 'post';
-            }else{
-              httpurl+=this.url.edit;
-               method = 'put';
-            }
-            httpAction(httpurl,this.model,method).then((res)=>{
-              if(res.success){
-                that.$message.success(res.message);
-                that.$emit('ok');
-              }else{
-                that.$message.warning(res.message);
-              }
-            }).finally(() => {
-              that.confirmLoading = false;
-            })
-          }
-         
-        })
-      },
-    }
-  }
-</script>
\ No newline at end of file
diff --git a/HRBNU/src/main/java/org/jeecg/modules/demo/rms/vue/modules/RmsLocationModal.Style#Drawer.vue b/HRBNU/src/main/java/org/jeecg/modules/demo/rms/vue/modules/RmsLocationModal.Style#Drawer.vue
deleted file mode 100644
index 4c75d90..0000000
--- a/HRBNU/src/main/java/org/jeecg/modules/demo/rms/vue/modules/RmsLocationModal.Style#Drawer.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<template>
-  <a-drawer
-    :title="title"
-    :width="width"
-    placement="right"
-    :closable="false"
-    @close="close"
-    destroyOnClose
-    :visible="visible">
-    <rms-location-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></rms-location-form>
-    <div class="drawer-footer">
-      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
-      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
-    </div>
-  </a-drawer>
-</template>
-
-<script>
-
-  import RmsLocationForm from './RmsLocationForm'
-
-  export default {
-    name: 'RmsLocationModal',
-    components: {
-      RmsLocationForm
-    },
-    data () {
-      return {
-        title:"操作",
-        width:800,
-        visible: false,
-        disableSubmit: false
-      }
-    },
-    methods: {
-      add () {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.add();
-        })
-      },
-      edit (record) {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.edit(record);
-        });
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      submitCallback(){
-        this.$emit('ok');
-        this.visible = false;
-      },
-      handleOk () {
-        this.$refs.realForm.submitForm();
-      },
-      handleCancel () {
-        this.close()
-      }
-    }
-  }
-</script>
-
-<style lang="less" scoped>
-/** Button按钮间距 */
-  .ant-btn {
-    margin-left: 30px;
-    margin-bottom: 30px;
-    float: right;
-  }
-  .drawer-footer{
-    position: absolute;
-    bottom: -8px;
-    width: 100%;
-    border-top: 1px solid #e8e8e8;
-    padding: 10px 16px;
-    text-align: right;
-    left: 0;
-    background: #fff;
-    border-radius: 0 0 2px 2px;
-  }
-</style>
\ No newline at end of file
diff --git a/HRBNU/src/main/java/org/jeecg/modules/demo/rms/vue/modules/RmsLocationModal.vue b/HRBNU/src/main/java/org/jeecg/modules/demo/rms/vue/modules/RmsLocationModal.vue
deleted file mode 100644
index f29ef5d..0000000
--- a/HRBNU/src/main/java/org/jeecg/modules/demo/rms/vue/modules/RmsLocationModal.vue
+++ /dev/null
@@ -1,60 +0,0 @@
-<template>
-  <j-modal
-    :title="title"
-    :width="width"
-    :visible="visible"
-    switchFullscreen
-    @ok="handleOk"
-    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
-    @cancel="handleCancel"
-    cancelText="关闭">
-    <rms-location-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></rms-location-form>
-  </j-modal>
-</template>
-
-<script>
-
-  import RmsLocationForm from './RmsLocationForm'
-  export default {
-    name: 'RmsLocationModal',
-    components: {
-      RmsLocationForm
-    },
-    data () {
-      return {
-        title:'',
-        width:800,
-        visible: false,
-        disableSubmit: false
-      }
-    },
-    methods: {
-      add () {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.add();
-        })
-      },
-      edit (record) {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.edit(record);
-        })
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      handleOk () {
-        this.$refs.realForm.submitForm();
-      },
-      submitCallback(){
-        this.$emit('ok');
-        this.visible = false;
-      },
-      handleCancel () {
-        this.close()
-      }
-    }
-  }
-</script>
\ No newline at end of file
diff --git a/HRBNU/src/main/java/test.java b/HRBNU/src/main/java/test.java
deleted file mode 100644
index 94a8aee..0000000
--- a/HRBNU/src/main/java/test.java
+++ /dev/null
@@ -1,5 +0,0 @@
-public class test {
-    public static void main(String[] args) {
-        System.out.println("test3");
-    }
-}
diff --git a/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml b/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml
index c1e4afb..81e89f1 100644
--- a/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml
+++ b/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml
@@ -1,5 +1,5 @@
 server:
-  port: 8080
+  port: 8088
   tomcat:
     max-swallow-size: -1
   error: