Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
K
klck
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
位宇华
klck
Commits
c08a3239
Commit
c08a3239
authored
Jul 21, 2023
by
xiangjiaojunxp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
物资详情模块
parent
d4d3aca2
Changes
5
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
75 additions
and
148 deletions
+75
-148
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysSuppliesController.java
...om/ruoyi/web/controller/system/SysSuppliesController.java
+1
-3
ruoyi-admin/src/main/resources/application-dev.yml
ruoyi-admin/src/main/resources/application-dev.yml
+1
-1
ruoyi-admin/src/main/resources/application-druid.yml
ruoyi-admin/src/main/resources/application-druid.yml
+1
-1
ruoyi-admin/src/main/resources/logback.xml
ruoyi-admin/src/main/resources/logback.xml
+1
-1
ruoyi-ui/src/views/system/supplies/index.vue
ruoyi-ui/src/views/system/supplies/index.vue
+71
-142
No files found.
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysSuppliesController.java
View file @
c08a3239
...
@@ -5,7 +5,6 @@ import com.ruoyi.common.core.controller.BaseController;
...
@@ -5,7 +5,6 @@ import com.ruoyi.common.core.controller.BaseController;
import
com.ruoyi.common.core.domain.AjaxResult
;
import
com.ruoyi.common.core.domain.AjaxResult
;
import
com.ruoyi.common.core.page.TableDataInfo
;
import
com.ruoyi.common.core.page.TableDataInfo
;
import
com.ruoyi.common.enums.BusinessType
;
import
com.ruoyi.common.enums.BusinessType
;
import
com.ruoyi.system.domain.ActSuppliesTemplate
;
import
com.ruoyi.system.domain.SysSupplies
;
import
com.ruoyi.system.domain.SysSupplies
;
import
com.ruoyi.system.service.ISysSuppliesService
;
import
com.ruoyi.system.service.ISysSuppliesService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
@@ -33,12 +32,11 @@ public class SysSuppliesController extends BaseController
...
@@ -33,12 +32,11 @@ public class SysSuppliesController extends BaseController
*/
*/
@PreAuthorize
(
"@ss.hasPermi('system:supplies:list')"
)
@PreAuthorize
(
"@ss.hasPermi('system:supplies:list')"
)
@GetMapping
(
"/list"
)
@GetMapping
(
"/list"
)
public
TableDataInfo
list
(
ActSuppliesTemplate
sysSupplies
)
public
TableDataInfo
list
(
SysSupplies
sysSupplies
)
{
{
startPage
();
startPage
();
List
<
SysSupplies
>
list
=
iSysSuppliesService
.
list
();
List
<
SysSupplies
>
list
=
iSysSuppliesService
.
list
();
return
getDataTable
(
list
);
return
getDataTable
(
list
);
}
}
/**
/**
* 保存物资管理列表
* 保存物资管理列表
...
...
ruoyi-admin/src/main/resources/application-dev.yml
View file @
c08a3239
...
@@ -8,7 +8,7 @@ spring:
...
@@ -8,7 +8,7 @@ spring:
master
:
master
:
url
:
jdbc:mysql://localhost:3306/hbghgz_sc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
url
:
jdbc:mysql://localhost:3306/hbghgz_sc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username
:
root
username
:
root
password
:
123456
password
:
root
# 从库数据源
# 从库数据源
slave
:
slave
:
# 从数据源开关/默认关闭
# 从数据源开关/默认关闭
...
...
ruoyi-admin/src/main/resources/application-druid.yml
View file @
c08a3239
...
@@ -8,7 +8,7 @@ spring:
...
@@ -8,7 +8,7 @@ spring:
master
:
master
:
url
:
jdbc:mysql://localhost:3306/hbghgz_sc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
url
:
jdbc:mysql://localhost:3306/hbghgz_sc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
username
:
root
username
:
root
password
:
123456
password
:
root
# 从库数据源
# 从库数据源
slave
:
slave
:
# 从数据源开关/默认关闭
# 从数据源开关/默认关闭
...
...
ruoyi-admin/src/main/resources/logback.xml
View file @
c08a3239
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<configuration>
<!-- 日志存放路径 -->
<!-- 日志存放路径 -->
<property
name=
"log.path"
value=
"
H:/Project/java/klck/klck
/hbghgz/logs"
/>
<property
name=
"log.path"
value=
"
D:/develop/idea-workspace/klbsxt
/hbghgz/logs"
/>
<!-- 日志输出格式 -->
<!-- 日志输出格式 -->
<property
name=
"log.pattern"
value=
"%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"
/>
<property
name=
"log.pattern"
value=
"%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"
/>
...
...
ruoyi-ui/src/views/system/supplies/index.vue
View file @
c08a3239
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment