root
/
smart-erp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	.gitignore
erp、
ling li 1 year ago
parent
2ddbacf38c f587ca90ab
commit
88e29fbe09
35 changed files with 4502 additions and 640812 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      .gitignore
  2. 57597
      log.path_IS_UNDEFINED/sys-error.2023-02-13.log
  3. 72708
      log.path_IS_UNDEFINED/sys-error.2023-02-14.log
  4. 107633
      log.path_IS_UNDEFINED/sys-error.2023-02-15.log
  5. 363789
      log.path_IS_UNDEFINED/sys-error.2023-02-16.log
  6. 37950
      log.path_IS_UNDEFINED/sys-error.log
  7. 24
      log.path_IS_UNDEFINED/sys-user.2023-02-13.log
  8. 28
      log.path_IS_UNDEFINED/sys-user.2023-02-14.log
  9. 14
      log.path_IS_UNDEFINED/sys-user.2023-02-15.log
  10. 128
      log.path_IS_UNDEFINED/sys-user.2023-02-16.log
  11. 62
      log.path_IS_UNDEFINED/sys-user.log
  12. 17
      ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
  13. 886
      ruoyi-admin/src/main/resources/templates/finance/customer/customer.html
  14. 1
      ruoyi-admin/src/main/resources/templates/manufacture/deliveryGoodsDetail/deliveryGoodsDetail.html
  15. 9
      ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/purchaseOrder.html
  16. 4
      ruoyi-admin/src/main/resources/templates/returnGoods/returnGoodsOrder/returnGoodsOrder.html
  17. 78
      ruoyi-admin/src/main/resources/templates/sales/salesAccountReconciliation/salesAccountReconciliation.html
  18. 2
      ruoyi-admin/src/main/resources/templates/system/bom/bom.html
  19. 4
      ruoyi-admin/src/main/resources/templates/system/customer/customer.html
  20. 6
      ruoyi-admin/src/main/resources/templates/system/productquotation/productquotation.html
  21. 6
      ruoyi-admin/src/main/resources/templates/system/qutsourcingquotation/qutsourcingquotation.html
  22. 4
      ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html
  23. 6
      ruoyi-admin/src/main/resources/templates/system/supplierquotation/supplierquotation.html
  24. BIN
      ruoyi-admin/target/classes/com/ruoyi/RuoYiApplication.class
  25. 886
      ruoyi-admin/target/classes/templates/finance/customer/customer.html
  26. 1
      ruoyi-admin/target/classes/templates/manufacture/deliveryGoodsDetail/deliveryGoodsDetail.html
  27. 9
      ruoyi-admin/target/classes/templates/purchase/purchaseOrder/purchaseOrder.html
  28. 4
      ruoyi-admin/target/classes/templates/returnGoods/returnGoodsOrder/returnGoodsOrder.html
  29. 78
      ruoyi-admin/target/classes/templates/sales/salesAccountReconciliation/salesAccountReconciliation.html
  30. 2
      ruoyi-admin/target/classes/templates/system/bom/bom.html
  31. 4
      ruoyi-admin/target/classes/templates/system/customer/customer.html
  32. 6
      ruoyi-admin/target/classes/templates/system/productquotation/productquotation.html
  33. 6
      ruoyi-admin/target/classes/templates/system/qutsourcingquotation/qutsourcingquotation.html
  34. 8
      ruoyi-admin/target/classes/templates/system/salesOrder/salesOrder.html
  35. 6
      ruoyi-admin/target/classes/templates/system/supplierquotation/supplierquotation.html

4
.gitignore
View File

@ -1,5 +1,7 @@
/log.path_IS_UNDEFINED/
/.idea/
/*/target/
/log.path_IS_UNDEFINED/*
/log.path_IS_UNDEFINED/
/*/target/*
/ruoyi-admin/target/

57597
log.path_IS_UNDEFINED/sys-error.2023-02-13.log
View File

File diff suppressed because it is too large

72708
log.path_IS_UNDEFINED/sys-error.2023-02-14.log
View File

File diff suppressed because it is too large

107633
log.path_IS_UNDEFINED/sys-error.2023-02-15.log
View File

File diff suppressed because it is too large

363789
log.path_IS_UNDEFINED/sys-error.2023-02-16.log
View File

File diff suppressed because it is too large

37950
log.path_IS_UNDEFINED/sys-error.log
View File

File diff suppressed because it is too large

24
log.path_IS_UNDEFINED/sys-user.2023-02-13.log
View File

@ -1,24 +0,0 @@
09:37:47.804 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
09:41:35.923 [Thread-44] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
09:41:35.924 [Thread-44] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
09:41:35.924 [Thread-44] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
09:43:36.316 [Thread-58] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
09:43:36.316 [Thread-58] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
11:10:24.393 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
11:10:24.395 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
11:19:49.101 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
11:32:39.028 [SpringContextShutdownHook] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
11:32:39.029 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
11:32:39.029 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
11:33:19.634 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
13:50:55.987 [Thread-37] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
13:50:55.989 [Thread-37] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
13:50:55.989 [Thread-37] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
14:43:58.907 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
15:44:46.698 [SpringContextShutdownHook] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
15:44:46.700 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
15:44:46.700 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
15:45:18.534 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
18:01:30.647 [SpringContextShutdownHook] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
18:01:30.654 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
18:01:30.654 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====

28
log.path_IS_UNDEFINED/sys-user.2023-02-14.log
View File

@ -1,28 +0,0 @@
09:11:11.401 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
10:08:51.545 [SpringContextShutdownHook] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
10:08:51.546 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
10:08:51.546 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
10:10:28.748 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
11:06:00.506 [SpringContextShutdownHook] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
11:06:00.508 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
11:06:00.508 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
11:06:30.355 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
11:09:32.145 [SpringContextShutdownHook] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
11:09:32.146 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
11:09:32.146 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
11:10:03.856 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
11:36:14.523 [SpringContextShutdownHook] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
11:36:14.525 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
11:36:14.525 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
11:37:56.032 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
11:40:51.283 [Thread-53] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
11:40:51.283 [Thread-53] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
11:40:51.283 [Thread-53] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
11:51:51.237 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
17:03:39.177 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
17:56:36.504 [Thread-41] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
17:56:36.507 [Thread-41] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
17:56:36.507 [Thread-41] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
18:02:57.984 [SpringContextShutdownHook] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
18:02:57.986 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
18:02:57.986 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====

14
log.path_IS_UNDEFINED/sys-user.2023-02-15.log
View File

@ -1,14 +0,0 @@
15:16:45.076 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
15:17:41.559 [SpringContextShutdownHook] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
15:17:41.559 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
15:17:41.559 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
15:18:16.972 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
15:26:04.728 [Thread-44] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
15:26:04.729 [Thread-44] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
15:26:04.729 [Thread-44] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
15:26:30.158 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
17:51:27.560 [Thread-57] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
17:51:27.563 [Thread-57] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
17:51:27.563 [Thread-57] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
18:04:01.396 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
18:04:01.398 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====

128
log.path_IS_UNDEFINED/sys-user.2023-02-16.log
View File

@ -1,128 +0,0 @@
08:36:27.405 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
10:51:04.043 [Thread-43] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
10:51:04.050 [Thread-43] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
10:51:04.050 [Thread-43] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
10:54:34.993 [Thread-56] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
10:54:34.994 [Thread-56] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
10:55:27.028 [Thread-69] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
10:55:27.033 [Thread-69] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
11:19:08.223 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
15:53:13.305 [Thread-82] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
15:53:13.310 [Thread-82] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
15:53:13.310 [Thread-82] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
15:53:28.869 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
15:53:28.870 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
16:08:51.658 [Thread-52] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
16:08:51.659 [Thread-52] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
16:09:17.651 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
16:15:36.880 [Thread-67] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
16:15:36.881 [Thread-67] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
16:15:36.881 [Thread-67] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
16:17:20.925 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
16:17:20.926 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
16:17:47.641 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
16:27:50.418 [Thread-40] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
16:27:50.424 [Thread-40] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
16:27:50.424 [Thread-40] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
16:28:07.490 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
16:28:07.490 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
16:29:20.809 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
16:35:56.124 [Thread-38] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
16:35:56.125 [Thread-38] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
16:35:56.125 [Thread-38] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
16:36:59.362 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
16:44:52.883 [SpringContextShutdownHook] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
16:44:52.884 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
16:44:52.884 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
16:54:36.989 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
16:55:16.508 [Thread-39] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
16:55:16.509 [Thread-39] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
16:55:16.509 [Thread-39] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
16:55:45.701 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
16:56:18.959 [SpringContextShutdownHook] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
16:56:18.959 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
16:56:18.960 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
17:00:39.532 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
17:03:31.868 [Thread-42] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
17:03:31.869 [Thread-42] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
17:03:31.869 [Thread-42] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
17:03:46.197 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
17:03:46.198 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
17:04:08.361 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
17:04:59.677 [Thread-41] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
17:04:59.678 [Thread-41] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
17:04:59.678 [Thread-41] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
17:05:15.178 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
17:05:15.180 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
17:05:58.566 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
17:12:56.051 [Thread-44] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
17:12:56.052 [Thread-44] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
17:12:56.052 [Thread-44] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
17:13:09.662 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
17:13:09.664 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
17:13:34.261 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
17:20:06.753 [Thread-42] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
17:20:06.755 [Thread-42] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
17:20:06.755 [Thread-42] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
17:27:31.455 [Thread-55] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
17:27:31.456 [Thread-55] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
17:28:00.168 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
17:29:37.867 [SpringContextShutdownHook] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
17:29:37.868 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
17:29:37.869 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
17:30:04.409 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
17:34:09.943 [SpringContextShutdownHook] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
17:34:09.944 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
17:34:09.944 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
17:34:36.387 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
17:37:33.782 [Thread-44] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
17:37:33.783 [Thread-44] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
17:37:33.783 [Thread-44] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
17:38:33.567 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
17:39:58.719 [SpringContextShutdownHook] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
17:39:58.719 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
17:39:58.720 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
17:40:21.826 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
17:55:35.747 [SpringContextShutdownHook] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
17:55:35.748 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
17:55:35.749 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
17:58:53.439 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
18:00:33.039 [SpringContextShutdownHook] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
18:00:33.040 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
18:00:33.040 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
18:01:36.488 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
18:03:59.077 [SpringContextShutdownHook] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
18:03:59.077 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
18:03:59.077 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
18:04:28.358 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
18:05:31.557 [SpringContextShutdownHook] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
18:05:31.558 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
18:05:31.558 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
18:06:17.153 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
18:08:36.256 [Thread-41] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
18:08:36.257 [Thread-41] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
18:08:36.257 [Thread-41] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
18:09:55.251 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
18:09:55.252 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
18:10:20.935 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
18:13:27.998 [Thread-39] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
18:13:27.999 [Thread-39] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
18:13:27.999 [Thread-39] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
18:13:40.354 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
18:13:40.355 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
18:14:07.282 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
18:14:56.468 [Thread-39] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
18:14:56.469 [Thread-39] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
18:14:56.470 [Thread-39] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
18:17:14.302 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
18:17:14.302 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
18:17:40.915 [schedule-pool-1] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
18:18:57.410 [SpringContextShutdownHook] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
18:18:57.410 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
18:18:57.410 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
18:19:43.789 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
18:21:08.234 [Thread-45] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
18:21:08.235 [Thread-45] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
18:21:08.235 [Thread-45] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
18:42:07.680 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
18:42:07.686 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====

62
log.path_IS_UNDEFINED/sys-user.log
View File

@ -1,55 +1,7 @@
09:32:42.793 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
10:20:29.882 [SpringContextShutdownHook] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
10:20:29.884 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
10:20:29.884 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
10:21:13.370 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
11:41:05.697 [Thread-44] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
11:41:05.705 [Thread-44] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
11:41:05.706 [Thread-44] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
11:41:38.122 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
13:59:12.021 [Thread-57] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
13:59:12.023 [Thread-57] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
13:59:12.024 [Thread-57] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
14:25:01.336 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
14:25:01.339 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
14:25:30.033 [Thread-42] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
14:25:30.035 [Thread-42] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
14:25:30.035 [Thread-42] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
14:28:27.369 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
14:34:03.463 [SpringContextShutdownHook] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
14:34:03.464 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
14:34:03.464 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
14:35:35.850 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
14:41:46.078 [Thread-44] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
14:41:46.079 [Thread-44] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
14:41:46.079 [Thread-44] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
14:42:28.296 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
14:42:28.709 [Thread-57] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
14:42:28.711 [Thread-57] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
14:42:28.711 [Thread-57] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
14:42:46.712 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
14:45:59.831 [Thread-70] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
14:45:59.832 [Thread-70] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
14:45:59.832 [Thread-70] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
14:50:25.251 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
14:50:25.253 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
15:07:49.499 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
15:22:10.232 [schedule-pool-7] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Logout][退出成功]
15:22:12.765 [schedule-pool-4] INFO sys-user - [run,109] - [127.0.0.1]内网IP[ppp][Success][登录成功]
15:22:23.743 [schedule-pool-1] INFO sys-user - [run,109] - [127.0.0.1]内网IP[ppp][Logout][退出成功]
15:22:26.170 [schedule-pool-17] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
15:23:05.088 [schedule-pool-19] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Logout][退出成功]
15:23:07.267 [schedule-pool-3] INFO sys-user - [run,109] - [127.0.0.1]内网IP[ppp][Success][登录成功]
15:24:51.177 [schedule-pool-21] INFO sys-user - [run,109] - [127.0.0.1]内网IP[ppp][Logout][退出成功]
15:24:53.340 [schedule-pool-7] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
15:26:03.835 [schedule-pool-23] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Logout][退出成功]
15:26:06.319 [schedule-pool-6] INFO sys-user - [run,109] - [127.0.0.1]内网IP[ppp][Success][登录成功]
15:27:11.264 [schedule-pool-37] INFO sys-user - [run,109] - [127.0.0.1]内网IP[ppp][Logout][退出成功]
15:27:13.282 [schedule-pool-12] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
16:02:09.537 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
16:19:40.315 [Thread-47] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
16:19:40.315 [Thread-47] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
16:19:40.315 [Thread-47] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
17:05:32.168 [Thread-60] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
17:08:37.229 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
17:08:37.230 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
16:35:08.506 [restartedMain] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
16:35:08.509 [restartedMain] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
16:37:16.962 [restartedMain] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
16:37:16.972 [restartedMain] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
16:39:36.771 [restartedMain] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
16:39:36.774 [restartedMain] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
16:44:41.300 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]

17
ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
View File

@ -13,21 +13,10 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
org.activiti.spring.boot.SecurityAutoConfiguration.class,
org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class
})
public class RuoYiApplication
{
public static void main(String[] args)
{
public class RuoYiApplication {
public static void main(String[] args) {
// System.setProperty("spring.devtools.restart.enabled", "false");
SpringApplication.run(RuoYiApplication.class, args);
System.out.println("(♥◠‿◠)ﾉﾞ 若依启动成功 ლ(´ڡ`ლ)ﾞ \n" +
" .-------. ____ __ \n" +
" | _ _ \\ \\ \\ / / \n" +
" | ( ' ) | \\ _. / ' \n" +
" |(_ o _) / _( )_ .' \n" +
" | (_,_).' __ ___(_ o _)' \n" +
" | |\\ \\ | || |(_,_)' \n" +
" | | \\ `' /| `-' / \n" +
" | | \\ / \\ / \n" +
" ''-' `'-' `-..-' ");
System.out.println("(♥◠‿◠)ﾉﾞ 若依启动成功 ლ(´ڡ`ლ)ﾞ \n");
}
}

886
ruoyi-admin/src/main/resources/templates/finance/customer/customer.html
View File

@ -1,461 +1,461 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
<th:block th:include="include :: header('客户资料列表')"/>
</head>
<body class="gray-bg">
<div class="container-div">
<div class="row">
<div class="col-sm-12 search-collapse">
<form id="formId">
<div class="select-list">
<ul>
<li>
<label>企业代码：</label>
<input type="text" name="pCode"/>
</li>
<li>
<label>企业名称：</label>
<input type="text" name="pName"/>
</li>
<li>
<label>内外销：</label><select name="NWX" th:with="type=${@dict.getType('sys_NWX_class')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
th:value="${dict.dictValue}"></option>
</select>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
class="fa fa-refresh"></i>&nbsp;重置</a>
</li>
</ul>
</div>
</form>
</div>
<!--<!DOCTYPE html>-->
<!--<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">-->
<!--<head>-->
<!-- <th:block th:include="include :: header('客户资料列表')"/>-->
<!--</head>-->
<!--<body class="gray-bg">-->
<!--<div class="container-div">-->
<!-- <div class="row">-->
<!-- <div class="col-sm-12 search-collapse">-->
<!-- <form id="formId">-->
<!-- <div class="select-list">-->
<!-- <ul>-->
<!-- <li>-->
<!-- <label>企业代码：</label>-->
<!-- <input type="text" name="pCode"/>-->
<!-- </li>-->
<!-- <li>-->
<!-- <label>企业名称：</label>-->
<!-- <input type="text" name="pName"/>-->
<!-- </li>-->
<!-- <li>-->
<!-- <label>内外销：</label><select name="NWX" th:with="type=${@dict.getType('sys_NWX_class')}">-->
<!-- <option value="">所有</option>-->
<!-- <option th:each="dict : ${type}" th:text="${dict.dictLabel}"-->
<!-- th:value="${dict.dictValue}"></option>-->
<!-- </select>-->
<!-- </li>-->
<!-- <li>-->
<!-- <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i-->
<!-- class="fa fa-search"></i>&nbsp;搜索</a>-->
<!-- <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i-->
<!-- class="fa fa-refresh"></i>&nbsp;重置</a>-->
<!-- </li>-->
<!-- </ul>-->
<!-- </div>-->
<!-- </form>-->
<!-- </div>-->
<div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="finance:customer:add">
<i class="fa fa-plus"></i> 添加
</a>
<a class="btn btn-primary single disabled" onclick="$.operate.edit()"
shiro:hasPermission="finance:customer:edit">
<i class="fa fa-edit"></i> 修改
</a>
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()"
shiro:hasPermission="finance:customer:remove">
<i class="fa fa-remove"></i> 删除
</a>
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="finance:customer:export">
<i class="fa fa-download"></i> 导出
</a>
<a class="btn btn-success single disabled" onclick="comfirm()"
shiro:hasPermission="finance:customer:export">
<i class="glyphicon glyphicon-ok"></i> 确认
</a>
</div>
<div class="col-sm-12 select-table table-striped table-single">
<table id="bootstrap-table"></table>
</div>
</div>
</div>
<th:block th:include="include :: footer"/>
<script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('finance:customer:edit')}]];
var removeFlag = [[${@permission.hasPermi('finance:customer:remove')}]];
var prefix = ctx + "finance/customer";
<!-- <div class="btn-group-sm" id="toolbar" role="group">-->
<!-- <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="finance:customer:add">-->
<!-- <i class="fa fa-plus"></i> 添加-->
<!-- </a>-->
<!-- <a class="btn btn-primary single disabled" onclick="$.operate.edit()"-->
<!-- shiro:hasPermission="finance:customer:edit">-->
<!-- <i class="fa fa-edit"></i> 修改-->
<!-- </a>-->
<!-- <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()"-->
<!-- shiro:hasPermission="finance:customer:remove">-->
<!-- <i class="fa fa-remove"></i> 删除-->
<!-- </a>-->
<!-- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="finance:customer:export">-->
<!-- <i class="fa fa-download"></i> 导出-->
<!-- </a>-->
<!-- <a class="btn btn-success single disabled" onclick="comfirm()"-->
<!-- shiro:hasPermission="finance:customer:export">-->
<!-- <i class="glyphicon glyphicon-ok"></i> 确认-->
<!-- </a>-->
<!-- </div>-->
<!-- <div class="col-sm-12 select-table table-striped table-single">-->
<!-- <table id="bootstrap-table"></table>-->
<!-- </div>-->
<!-- </div>-->
<!--</div>-->
<!--<th:block th:include="include :: footer"/>-->
<!--<script th:inline="javascript">-->
<!-- var editFlag = [[${@permission.hasPermi('finance:customer:edit')}]];-->
<!-- var removeFlag = [[${@permission.hasPermi('finance:customer:remove')}]];-->
<!-- var prefix = ctx + "finance/customer";-->
$(function () {
var options = {
url: prefix + "/list",
createUrl: prefix + "/add",
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export",
onClickRow: onClickRow,//行点击事件
modalName: "客户资料",
columns: [{
checkbox: true
},
{
field: 'pCode',
title: '企业代码'
},
{
field: 'pName',
title: '企业名称'
},
{
field: 'pEnName',
title: '企业英文名称',
formatter: function (value, row, index) {
return $.table.tooltip(value);
},
visible: false
},
{
field: 'pAddress',
title: '地址',
visible: false
},
{
field: 'pPost',
title: '邮编',
visible: false
},
{
field: 'pCountry',
title: '国家地区',
visible: false
},
{
field: 'pCeo',
title: '法人代表',
visible: false
},
{
field: 'pLinkman',
title: '联系人'
},
{
field: 'pTel',
title: '联系电话',
formatter: function (value, row, index) {
return $.table.tooltip(value);
}
},
{
field: 'pFax',
title: '传真',
visible: false
},
{
field: 'pEmail',
title: 'EMAIL',
formatter: function (value, row, index) {
return $.table.tooltip(value);
}
},
{
field: 'pHttp',
title: '客户简称',
visible: false
},
{
field: 'pCiqCode',
title: '',
visible: false
},
{
field: 'pComCode',
title: '付款条件',
formatter: function (value, row, index) {
return $.table.tooltip(value);
}
},
{
field: 'pHyCode',
title: '发票代码',
formatter: function (value, row, index) {
return $.table.tooltip(value);
}
},
{
field: 'pCreatDate',
title: '成立时间',
visible: false
},
{
field: 'pJhbank',
title: '结汇银行',
visible: false
},
{
field: 'pJhbankCode',
title: '结汇账号',
visible: false
},
{
field: 'pBank',
title: '开户银行',
visible: false
},
{
field: 'pBankCode',
title: '开户银行账号',
visible: false
},
{
field: 'pRmbMoney',
title: '人民币注册资金',
visible: false
},
{
field: 'pWbType',
title: '送货地址',
formatter: function (value, row, index) {
return $.table.tooltip(value);
}
},
{
field: 'pWbMoney',
title: '外币注册资金',
visible: false
},
{
field: 'memoText',
title: '备注内容',
visible: false
},
{
field: 'moral',
title: '诚信评级',
visible: false
},
{
field: 'comfirmDate',
title: '确认时间',
visible: false
},
{
field: 'writeMan',
title: '制单人名',
visible: false
},
{
field: 'writeDate',
title: '',
visible: false
},
{
field: 'creditAmt',
title: '信用额度',
visible: false
},
{
field: 'NWX',
title: '内外销',
visible: false
},
{
field: 'ordernoLen',
title: '订单号长度'
},
{
field: 'sendcpReportname',
title: '出货单格式名称',
visible: false
},
{
field: 'saler',
title: '业务员'
},
{
field: 'dWaterNo',
title: '目的地港代号',
visible: false
},
{
field: 'sWaterName',
title: '起运港名',
visible: false
},
{
field: 'crlName',
title: '币别',
visible: false
},
{
field: 'pCountryCode',
title: '国家地区编号'
},
{
field: 'senduseConfirm',
title: '出货需录入使用量',
visible: false
},
{
field: 'taxPercent',
title: '税率',
visible: false
},
{
field: 'senddw',
title: '',
visible: false
},
{
field: 'taxFlag',
title: '含税否',
visible: false
},
{
field: 'comfirmFlag',
title: '确认否',
formatter: function (value, row, index) {
if (value == 1){
value = "是"
return value
} else {
value = "否"
return value
}
}
},
{
field: 'comfirmMan',
title: '确认人',
},
{
title: '操作',
align: 'center',
formatter: function (value, row, index) {
var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.pCode + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.pCode + '\')"><i class="fa fa-remove"></i>删除</a>');
return actions.join('');
}
}]
};
$.table.init(options);
});
<!-- $(function () {-->
<!-- var options = {-->
<!-- url: prefix + "/list",-->
<!-- createUrl: prefix + "/add",-->
<!-- updateUrl: prefix + "/edit/{id}",-->
<!-- removeUrl: prefix + "/remove",-->
<!-- exportUrl: prefix + "/export",-->
<!-- onClickRow: onClickRow,//行点击事件-->
<!-- modalName: "客户资料",-->
<!-- columns: [{-->
<!-- checkbox: true-->
<!-- },-->
<!-- {-->
<!-- field: 'pCode',-->
<!-- title: '企业代码'-->
<!-- },-->
<!-- {-->
<!-- field: 'pName',-->
<!-- title: '企业名称'-->
<!-- },-->
<!-- {-->
<!-- field: 'pEnName',-->
<!-- title: '企业英文名称',-->
<!-- formatter: function (value, row, index) {-->
<!-- return $.table.tooltip(value);-->
<!-- },-->
<!-- visible: false-->
<!-- },-->
<!-- {-->
<!-- field: 'pAddress',-->
<!-- title: '地址',-->
<!-- visible: false-->
<!-- },-->
<!-- {-->
<!-- field: 'pPost',-->
<!-- title: '邮编',-->
<!-- visible: false-->
<!-- },-->
<!-- {-->
<!-- field: 'pCountry',-->
<!-- title: '国家地区',-->
<!-- visible: false-->
<!-- },-->
<!-- {-->
<!-- field: 'pCeo',-->
<!-- title: '法人代表',-->
<!-- visible: false-->
<!-- },-->
<!-- {-->
<!-- field: 'pLinkman',-->
<!-- title: '联系人'-->
<!-- },-->
<!-- {-->
<!-- field: 'pTel',-->
<!-- title: '联系电话',-->
<!-- formatter: function (value, row, index) {-->
<!-- return $.table.tooltip(value);-->
<!-- }-->
<!-- },-->
<!-- {-->
<!-- field: 'pFax',-->
<!-- title: '传真',-->
<!-- visible: false-->
<!-- },-->
<!-- {-->
<!-- field: 'pEmail',-->
<!-- title: 'EMAIL',-->
<!-- formatter: function (value, row, index) {-->
<!-- return $.table.tooltip(value);-->
<!-- }-->
<!-- },-->
<!-- {-->
<!-- field: 'pHttp',-->
<!-- title: '客户简称',-->
<!-- visible: false-->
<!-- },-->
<!-- {-->
<!-- field: 'pCiqCode',-->
<!-- title: '',-->
<!-- visible: false-->
<!-- },-->
<!-- {-->
<!-- field: 'pComCode',-->
<!-- title: '付款条件',-->
<!-- formatter: function (value, row, index) {-->
<!-- return $.table.tooltip(value);-->
<!-- }-->
<!-- },-->
<!-- {-->
<!-- field: 'pHyCode',-->
<!-- title: '发票代码',-->
<!-- formatter: function (value, row, index) {-->
<!-- return $.table.tooltip(value);-->
<!-- }-->
<!-- },-->
<!-- {-->
<!-- field: 'pCreatDate',-->
<!-- title: '成立时间',-->
<!-- visible: false-->
<!-- },-->
<!-- {-->
<!-- field: 'pJhbank',-->
<!-- title: '结汇银行',-->
<!-- visible: false-->
<!-- },-->
<!-- {-->
<!-- field: 'pJhbankCode',-->
<!-- title: '结汇账号',-->
<!-- visible: false-->
<!-- },-->
<!-- {-->
<!-- field: 'pBank',-->
<!-- title: '开户银行',-->
<!-- visible: false-->
<!-- },-->
<!-- {-->
<!-- field: 'pBankCode',-->
<!-- title: '开户银行账号',-->
<!-- visible: false-->
<!-- },-->
<!-- {-->
<!-- field: 'pRmbMoney',-->
<!-- title: '人民币注册资金',-->
<!-- visible: false-->
<!-- },-->
<!-- {-->
<!-- field: 'pWbType',-->
<!-- title: '送货地址',-->
<!-- formatter: function (value, row, index) {-->
<!-- return $.table.tooltip(value);-->
<!-- }-->
<!-- },-->
<!-- {-->
<!-- field: 'pWbMoney',-->
<!-- title: '外币注册资金',-->
<!-- visible: false-->
<!-- },-->
<!-- {-->
<!-- field: 'memoText',-->
<!-- title: '备注内容',-->
<!-- visible: false-->
<!-- },-->
<!-- {-->
<!-- field: 'moral',-->
<!-- title: '诚信评级',-->
<!-- visible: false-->
<!-- },-->
<!-- {-->
<!-- field: 'comfirmDate',-->
<!-- title: '确认时间',-->
<!-- visible: false-->
<!-- },-->
<!-- {-->
<!-- field: 'writeMan',-->
<!-- title: '制单人名',-->
<!-- visible: false-->
<!-- },-->
<!-- {-->
<!-- field: 'writeDate',-->
<!-- title: '',-->
<!-- visible: false-->
<!-- },-->
<!-- {-->
<!-- field: 'creditAmt',-->
<!-- title: '信用额度',-->
<!-- visible: false-->
<!-- },-->
<!-- {-->
<!-- field: 'NWX',-->
<!-- title: '内外销',-->
<!-- visible: false-->
<!-- },-->
<!-- {-->
<!-- field: 'ordernoLen',-->
<!-- title: '订单号长度'-->
<!-- },-->
<!-- {-->
<!-- field: 'sendcpReportname',-->
<!-- title: '出货单格式名称',-->
<!-- visible: false-->
<!-- },-->
<!-- {-->
<!-- field: 'saler',-->
<!-- title: '业务员'-->
<!-- },-->
<!-- {-->
<!-- field: 'dWaterNo',-->
<!-- title: '目的地港代号',-->
<!-- visible: false-->
<!-- },-->
<!-- {-->
<!-- field: 'sWaterName',-->
<!-- title: '起运港名',-->
<!-- visible: false-->
<!-- },-->
<!-- {-->
<!-- field: 'crlName',-->
<!-- title: '币别',-->
<!-- visible: false-->
<!-- },-->
<!-- {-->
<!-- field: 'pCountryCode',-->
<!-- title: '国家地区编号'-->
<!-- },-->
<!-- {-->
<!-- field: 'senduseConfirm',-->
<!-- title: '出货需录入使用量',-->
<!-- visible: false-->
<!-- },-->
<!-- {-->
<!-- field: 'taxPercent',-->
<!-- title: '税率',-->
<!-- visible: false-->
<!-- },-->
<!-- {-->
<!-- field: 'senddw',-->
<!-- title: '',-->
<!-- visible: false-->
<!-- },-->
<!-- {-->
<!-- field: 'taxFlag',-->
<!-- title: '含税否',-->
<!-- visible: false-->
<!-- },-->
<!-- {-->
<!-- field: 'comfirmFlag',-->
<!-- title: '确认否',-->
<!-- formatter: function (value, row, index) {-->
<!-- if (value == 1){-->
<!-- value = "是"-->
<!-- return value-->
<!-- } else {-->
<!-- value = "否"-->
<!-- return value-->
<!-- }-->
<!-- }-->
<!-- },-->
<!-- {-->
<!-- field: 'comfirmMan',-->
<!-- title: '确认人',-->
<!-- },-->
<!-- {-->
<!-- title: '操作',-->
<!-- align: 'center',-->
<!-- formatter: function (value, row, index) {-->
<!-- var actions = [];-->
<!-- actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.pCode + '\')"><i class="fa fa-edit"></i>编辑</a> ');-->
<!-- actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.pCode + '\')"><i class="fa fa-remove"></i>删除</a>');-->
<!-- return actions.join('');-->
<!-- }-->
<!-- }]-->
<!-- };-->
<!-- $.table.init(options);-->
<!-- });-->
// 获取记录总数
// $("#bootstrap-table").on("load-success.bs.table", function () {
// var total_row_num1 = $('#bootstrap-table').bootstrapTable('getOptions').totalRows;
// console.log(total_row_num1)
// });
<!-- // 获取记录总数-->
<!-- // $("#bootstrap-table").on("load-success.bs.table", function () {-->
<!-- // var total_row_num1 = $('#bootstrap-table').bootstrapTable('getOptions').totalRows;-->
<!-- // console.log(total_row_num1)-->
<!-- // });-->
Date.prototype.Format = function (fmt) {
var o = {
"M+": this.getMonth() + 1, //月份
"d+": this.getDate(), //日
"H+": this.getHours(), //小时
"m+": this.getMinutes(), //分
"s+": this.getSeconds(), //秒
"q+": Math.floor((this.getMonth() + 3) / 3), //季度
"S": this.getMilliseconds() //毫秒
};
if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));
for (var k in o)
if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
return fmt;
}
<!-- Date.prototype.Format = function (fmt) {-->
<!-- var o = {-->
<!-- "M+": this.getMonth() + 1, //月份-->
<!-- "d+": this.getDate(), //日-->
<!-- "H+": this.getHours(), //小时-->
<!-- "m+": this.getMinutes(), //分-->
<!-- "s+": this.getSeconds(), //秒-->
<!-- "q+": Math.floor((this.getMonth() + 3) / 3), //季度-->
<!-- "S": this.getMilliseconds() //毫秒-->
<!-- };-->
<!-- if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));-->
<!-- for (var k in o)-->
<!-- if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));-->
<!-- return fmt;-->
<!-- }-->
function comfirm() {
table.set();
$.modal.confirm("你确定数据正确，决定要确认吗？确认的记录不能删或修改 ", function () {
var P_Code = $.table.selectFirstColumns();
var userName = [[${@permission.getPrincipalProperty('userName')}]];
var date = new Date().Format("yyyy-MM-dd HH:mm:ss");
var editList = {"Id": P_Code.join(), "Name": userName, "Date": date}
var key = "comfirm";
var value = "comfirm";
var url = prefix + "/edit/comfirm";
editList[key] = value
$.operate.submit(url, "post", "json", editList);
});
}
<!-- function comfirm() {-->
<!-- table.set();-->
<!-- $.modal.confirm("你确定数据正确，决定要确认吗？确认的记录不能删或修改 ", function () {-->
<!-- var P_Code = $.table.selectFirstColumns();-->
<!-- var userName = [[${@permission.getPrincipalProperty('userName')}]];-->
<!-- var date = new Date().Format("yyyy-MM-dd HH:mm:ss");-->
<!-- var editList = {"Id": P_Code.join(), "Name": userName, "Date": date}-->
<!-- var key = "comfirm";-->
<!-- var value = "comfirm";-->
<!-- var url = prefix + "/edit/comfirm";-->
<!-- editList[key] = value-->
<!-- $.operate.submit(url, "post", "json", editList);-->
<!-- });-->
<!-- }-->
function onClickRow(row) {
// console.log("row"+JSON.stringify(row))
<!-- function onClickRow(row) {-->
<!-- // console.log("row"+JSON.stringify(row))-->
// $("#pCode").val(row.pCode);
// $("#pName").val(row.pName);
// $("#pEnName").val(row.pEnName);
// $("#pAddress").val(row.pAddress);
// $("#pWbType").val(row.pWbType);
// $("#pPost").val(row.pPost);
// $("#pCeo").val(row.pCeo);
//
// $("#memoText").val(row.memoText);
// $("#writeMan").val(row.writeMan);
// $("#comfirmMan").val(row.comfirmMan);
//
// $("#pLinkman").val(row.pLinkman);
// $("#pTel").val(row.pTel);
// $("#pFax").val(row.pFax);
// $("#pEmail").val(row.pEmail);
// $("#pHttp").val(row.pHttp);
// $("#pCiqCode").val(row.pCiqCode);
// $("#pComCode").val(row.pComCode);
// $("#pHyCode").val(row.pHyCode);
//
// $("#pType").val(row.pType);
// // $("#pCreatDate").val(row.pCreatDate);
// $("#pJhbank").val(row.pJhbank);
// $("#pJhbankCode").val(row.pJhbankCode);
// $("#pBank").val(row.pBank);
// $("#pBankCode").val(row.pBankCode);
// $("#pRmbMoney").val(row.pRmbMoney);
// $("#pWbMoney").val(row.pWbMoney);
// $("#ordernoLen").val(row.ordernoLen);
// // $("#saler").val(row.saler);
// $("#sendcpReportname").val(row.sendcpReportname);
//
// $("#dWaterNo").val(row.dWaterNo);
// $("#sWaterName").val(row.sWaterName);
// $("#sWaterNo").val(row.sWaterNo);
// $("#comCode").val(row.comCode);
// $("#crlName").val(row.crlName);
// $("#creditAmt").val(row.creditAmt);
// $("#ordernoLen").val(row.ordernoLen);
// $("#moral").val(row.moral);
// $("#senduseConfirm").val(row.senduseConfirm);
// $("#pCountry").val(row.pCountry);
// $("#pCountryCode").val(row.pCountryCode);
}
</script>
</body>
<style>
.label-100px li label:not(.radio-box) {
width: 110px;
}
<!-- // $("#pCode").val(row.pCode);-->
<!-- // $("#pName").val(row.pName);-->
<!-- // $("#pEnName").val(row.pEnName);-->
<!-- // $("#pAddress").val(row.pAddress);-->
<!-- // $("#pWbType").val(row.pWbType);-->
<!-- // $("#pPost").val(row.pPost);-->
<!-- // $("#pCeo").val(row.pCeo);-->
<!-- //-->
<!-- // $("#memoText").val(row.memoText);-->
<!-- // $("#writeMan").val(row.writeMan);-->
<!-- // $("#comfirmMan").val(row.comfirmMan);-->
<!-- //-->
<!-- // $("#pLinkman").val(row.pLinkman);-->
<!-- // $("#pTel").val(row.pTel);-->
<!-- // $("#pFax").val(row.pFax);-->
<!-- // $("#pEmail").val(row.pEmail);-->
<!-- // $("#pHttp").val(row.pHttp);-->
<!-- // $("#pCiqCode").val(row.pCiqCode);-->
<!-- // $("#pComCode").val(row.pComCode);-->
<!-- // $("#pHyCode").val(row.pHyCode);-->
<!-- //-->
<!-- // $("#pType").val(row.pType);-->
<!-- // // $("#pCreatDate").val(row.pCreatDate);-->
<!-- // $("#pJhbank").val(row.pJhbank);-->
<!-- // $("#pJhbankCode").val(row.pJhbankCode);-->
<!-- // $("#pBank").val(row.pBank);-->
<!-- // $("#pBankCode").val(row.pBankCode);-->
<!-- // $("#pRmbMoney").val(row.pRmbMoney);-->
<!-- // $("#pWbMoney").val(row.pWbMoney);-->
<!-- // $("#ordernoLen").val(row.ordernoLen);-->
<!-- // // $("#saler").val(row.saler);-->
<!-- // $("#sendcpReportname").val(row.sendcpReportname);-->
<!-- //-->
<!-- // $("#dWaterNo").val(row.dWaterNo);-->
<!-- // $("#sWaterName").val(row.sWaterName);-->
<!-- // $("#sWaterNo").val(row.sWaterNo);-->
<!-- // $("#comCode").val(row.comCode);-->
<!-- // $("#crlName").val(row.crlName);-->
<!-- // $("#creditAmt").val(row.creditAmt);-->
<!-- // $("#ordernoLen").val(row.ordernoLen);-->
<!-- // $("#moral").val(row.moral);-->
<!-- // $("#senduseConfirm").val(row.senduseConfirm);-->
<!-- // $("#pCountry").val(row.pCountry);-->
<!-- // $("#pCountryCode").val(row.pCountryCode);-->
<!-- }-->
<!--</script>-->
<!--</body>-->
<!--<style>-->
<!-- .label-100px li label:not(.radio-box) {-->
<!-- width: 110px;-->
<!-- }-->
.parallel {
width: 50%;
height: 30px;
float: left
}
<!-- .parallel {-->
<!-- width: 50%;-->
<!-- height: 30px;-->
<!-- float: left-->
<!-- }-->
#ordernoLen {
width: 50px;
}
<!-- #ordernoLen {-->
<!-- width: 50px;-->
<!-- }-->
#saler {
width: 86px;
}
<!-- #saler {-->
<!-- width: 86px;-->
<!-- }-->
#parallel-r {
width: 108px;
}
<!-- #parallel-r {-->
<!-- width: 108px;-->
<!-- }-->
#parallel-r {
text-align: left;
width: 55px;
}
<!-- #parallel-r {-->
<!-- text-align: left;-->
<!-- width: 55px;-->
<!-- }-->
#memoText {
width: 570px;
height: 66px;
display: inline;
}
<!-- #memoText {-->
<!-- width: 570px;-->
<!-- height: 66px;-->
<!-- display: inline;-->
<!-- }-->
.nema {
width: 200px;
float: left;
}
<!-- .nema {-->
<!-- width: 200px;-->
<!-- float: left;-->
<!-- }-->
#writeMan {
width: 120px;
}
<!-- #writeMan {-->
<!-- width: 120px;-->
<!-- }-->
#comfirmMan {
width: 120px;
}
</style>
</html>
<!-- #comfirmMan {-->
<!-- width: 120px;-->
<!-- }-->
<!--</style>-->
<!--</html>-->

1
ruoyi-admin/src/main/resources/templates/manufacture/deliveryGoodsDetail/deliveryGoodsDetail.html
View File

@ -165,6 +165,7 @@
};
$.table.init(options);
});
</script>
</body>
</html>

9
ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/purchaseOrder.html
View File

@ -82,16 +82,17 @@
<a class="btn btn-warning" onclick="exportPurchaseOrder()" shiro:hasPermission="purchase:purchaseOrder:export">
<i class="fa fa-download"></i> 导出
</a>
<a class="btn btn-primary" onclick="reviewCloseCase()">
<a class="btn btn-primary" onclick="reviewCloseCase()" shiro:hasPermission="purchase:purchaseOrder:close">
<i class="fa fa-hand-grab-o"></i> 结案
</a>
<a class="btn btn-primary" onclick="reviewConfirm()">
<a class="btn btn-primary" onclick="reviewConfirm()" shiro:hasPermission="purchase:purchaseOrder:confirm">
<i class="fa fa-hand-grab-o"></i> 确认
</a>
<a class="btn btn-primary" onclick="reviewAudit()">
<a class="btn btn-primary" onclick="reviewAudit()" shiro:hasPermission="purchase:purchaseOrder:audit">
<i class="fa fa-hand-grab-o"></i> 审核
</a>
<a class="btn btn-primary" onclick="reviewApprove()">
<a class="btn btn-primary" onclick="reviewApprove()" shiro:hasPermission="purchase:purchaseOrder:approve">
<i class="fa fa-hand-grab-o"></i> 核准
</a>
</div>

4
ruoyi-admin/src/main/resources/templates/returnGoods/returnGoodsOrder/returnGoodsOrder.html
View File

@ -124,10 +124,10 @@
<a class="btn btn-warning" onclick="exportOrderDetail()">
<i class="fa fa-download"></i> 导出订单详情
</a>
<a class="btn btn-success" onclick="closeCaseOrder()">
<a class="btn btn-success" onclick="closeCaseOrder()" shiro:hasPermission="returnGoods:returnGoodsOrder:close">
<i class="fa fa-hand-grab-o"></i> 结案
</a>
<a class="btn btn-success" onclick="confirmOrder()">
<a class="btn btn-success" onclick="confirmOrder()" shiro:hasPermission="returnGoods:returnGoodsOrder:confirm">
<i class="fa fa-hand-grab-o"></i> 确认
</a>
</div>

78
ruoyi-admin/src/main/resources/templates/sales/salesAccountReconciliation/salesAccountReconciliation.html
View File

@ -21,9 +21,11 @@
<ul>
<li class="select-time">
<label>创建时间： </label>
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
<input type="text" class="time-input" id="startTime" placeholder="开始时间"
name="params[beginTime]"/>
<span>-</span>
<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
<input type="text" class="time-input" id="endTime" placeholder="结束时间"
name="params[endTime]"/>
</li>
<li>
<label>订单号码：</label>
@ -45,21 +47,24 @@
<label>客户使用否：</label>
<select name="customerUseOrNot" th:with="type=${@dict.getType('sys_whether')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
th:value="${dict.dictValue}"></option>
</select>
</li>
<li>
<label>对账否：</label>
<select name="accountReconciliationOrNot" th:with="type=${@dict.getType('sys_whether')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
th:value="${dict.dictValue}"></option>
</select>
</li>
<li>
<label>是否开国税发票：</label>
<select name="nationalTaxBill" th:with="type=${@dict.getType('sys_whether')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
th:value="${dict.dictValue}"></option>
</select>
</li>
<li>
@ -71,8 +76,10 @@
<input type="text" name="finishProductName"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="searchAll()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="resetAll()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
<a class="btn btn-primary btn-rounded btn-sm" onclick="searchAll()"><i
class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="resetAll()"><i
class="fa fa-refresh"></i>&nbsp;重置</a>
</li>
</ul>
</div>
@ -93,13 +100,16 @@
<!-- <i class="fa fa-download"></i> 导出-->
<!-- </a>-->
<b>销售信息</b>
<a class="btn btn-success" onclick="confirmAccountReconciliation()">
<a class="btn btn-success" onclick="confirmAccountReconciliation()"
shiro:hasPermission="salesAccountReconciliation:salesAccountReconciliation:confirm">
<i class="fa fa-hand-grab-o"></i> 销售对账确认
</a>
<a class="btn btn-success" onclick="confirmCustomerUse()">
<a class="btn btn-success" onclick="confirmCustomerUse()"
shiro:hasPermission="salesAccountReconciliation:salesAccountReconciliation:customConfirm">
<i class="fa fa-hand-grab-o"></i> 客户使用确认
</a>
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="salesAccountReconciliation:salesAccountReconciliation:export">
<a class="btn btn-warning" onclick="$.table.exportExcel()"
shiro:hasPermission="salesAccountReconciliation:salesAccountReconciliation:export">
<i class="fa fa-download"></i> 导出
</a>
<!-- <a class="btn btn-primary" onclick="toNationalTaxBill()">-->
@ -108,7 +118,8 @@
</div>
<div class="btn-group-sm" id="toolbar1" role="group">
<b>退货信息</b>
<a class="btn btn-success" onclick="confirmRGAccountReconciliation()">
<a class="btn btn-success" onclick="confirmRGAccountReconciliation()"
shiro:hasPermission="salesAccountReconciliation:salesAccountReconciliation:returnConfirm">
<i class="fa fa-hand-grab-o"></i> 退货对账确认
</a>
<a class="btn btn-warning" onclick="exportRGExcel('formId')">
@ -146,22 +157,26 @@
<div class="form-group">
<label class="col-sm-3 control-label">对账否：</label>
<div class="col-sm-8">
<select id="accountReconciliationOrNot" name="accountReconciliationOrNot" class="form-control" th:with="type=${@dict.getType('sys_whether')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
<select id="accountReconciliationOrNot" name="accountReconciliationOrNot"
class="form-control" th:with="type=${@dict.getType('sys_whether')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">对账人：</label>
<div class="col-sm-8">
<input id="accountReconciliationPerson" name="accountReconciliationPerson" class="form-control" type="text">
<input id="accountReconciliationPerson" name="accountReconciliationPerson"
class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">对账时间：</label>
<div class="col-sm-8">
<div class="input-group date">
<input id="accountReconciliationTime" name="accountReconciliationTime" class="form-control" placeholder="yyyy-mm-dd hh:ii:ss" type="text">
<input id="accountReconciliationTime" name="accountReconciliationTime"
class="form-control" placeholder="yyyy-mm-dd hh:ii:ss" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
@ -192,7 +207,8 @@
<div class="form-group" style="display: none">
<label class="col-sm-4 control-label is-required">订单id：</label>
<div class="col-sm-8">
<input id="salesFinishId1" name="salesFinishId" class="form-control" type="text" required readonly>
<input id="salesFinishId1" name="salesFinishId" class="form-control" type="text" required
readonly>
</div>
</div>
<div class="form-group">
@ -204,20 +220,24 @@
<div class="form-group">
<label class="col-sm-4 control-label is-required">成品代码：</label>
<div class="col-sm-8">
<input id="finishProductCode" name="finishProductCode" class="form-control" type="text" required>
<input id="finishProductCode" name="finishProductCode" class="form-control" type="text"
required>
</div>
</div>
<div class="form-group">
<label class="col-sm-4 control-label is-required">成品名称：</label>
<div class="col-sm-8">
<input id="finishProductName" name="finishProductName" class="form-control" type="text" required>
<input id="finishProductName" name="finishProductName" class="form-control" type="text"
required>
</div>
</div>
<div class="form-group">
<label class="col-sm-4 control-label">客户使用否：</label>
<div class="col-sm-8">
<select id="customerUseOrNot" name="customerUseOrNot" class="form-control" th:with="type=${@dict.getType('sys_whether')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
<select id="customerUseOrNot" name="customerUseOrNot" class="form-control"
th:with="type=${@dict.getType('sys_whether')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
@ -231,7 +251,8 @@
<label class="col-sm-4 control-label">备注：</label>
<div class="col-sm-8">
<!-- <input id="customerUseRemarks" name="customerUseRemarks" class="form-control" type="text">-->
<textarea id="customerUseRemarks" name="customerUseRemarks" style="width: 100%;" rows="4"></textarea>
<textarea id="customerUseRemarks" name="customerUseRemarks" style="width: 100%;"
rows="4"></textarea>
</div>
</div>
</form>
@ -260,29 +281,34 @@
<div class="form-group" style="display: none">
<label class="col-sm-3 control-label is-required">退货产品id：</label>
<div class="col-sm-8">
<input id="returnGoodsProductId" name="returnGoodsProductId" class="form-control" type="text" required
<input id="returnGoodsProductId" name="returnGoodsProductId" class="form-control"
type="text" required
readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">对账否：</label>
<div class="col-sm-8">
<select id="accountReconciliationOrNot1" name="accountReconciliationOrNot" class="form-control" th:with="type=${@dict.getType('sys_whether')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
<select id="accountReconciliationOrNot1" name="accountReconciliationOrNot"
class="form-control" th:with="type=${@dict.getType('sys_whether')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">对账人：</label>
<div class="col-sm-8">
<input id="accountReconciliationPerson1" name="accountReconciliationPerson" class="form-control" type="text">
<input id="accountReconciliationPerson1" name="accountReconciliationPerson"
class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">对账时间：</label>
<div class="col-sm-8">
<div class="input-group date">
<input id="accountReconciliationTime1" name="accountReconciliationTime" class="form-control" placeholder="yyyy-mm-dd hh:ii:ss" type="text">
<input id="accountReconciliationTime1" name="accountReconciliationTime"
class="form-control" placeholder="yyyy-mm-dd hh:ii:ss" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>

2
ruoyi-admin/src/main/resources/templates/system/bom/bom.html
View File

@ -72,7 +72,7 @@
<a class="btn btn-warning" onclick="exportBomDetail()" shiro:hasPermission="system:bom:export">
<i class="fa fa-download"></i> 单个导出
</a>
<a class="btn btn-success" onclick="bomConfirm()">
<a class="btn btn-success" onclick="bomConfirm()" shiro:hasPermission="system:bom:confirm">
<i class="fa fa-hand-grab-o"></i> 确认
</a>

4
ruoyi-admin/src/main/resources/templates/system/customer/customer.html
View File

@ -109,10 +109,10 @@
<!-- <a class="btn btn-danger" onclick="oneexport()" shiro:hasPermission="system:customer:export">-->
<!-- <i class="fa fa-download"></i> 单个导出-->
<!-- </a>-->
<a class="btn btn-success" id="tocontacts" onclick="addContacts()">
<a class="btn btn-success" id="tocontacts" onclick="addContacts()" shiro:hasPermission="system:contacts:add">
<i class="fa fa-plus"></i> 添加联系人明细
</a>
<a class="btn btn-primary" onclick="showaddress()">
<a class="btn btn-primary" onclick="showaddress()" shiro:hasPermission="system:shippingaddress:add">
<i class="fa fa-ambulance"></i> 添加送货地址
</a>

6
ruoyi-admin/src/main/resources/templates/system/productquotation/productquotation.html
View File

@ -103,15 +103,15 @@
shiro:hasPermission="system:productquotation:export">
<i class="fa fa-download"></i> 导出
</a>
<a class="btn btn-info" onclick="quotationAudit()">
<a class="btn btn-info" onclick="quotationAudit()" shiro:hasPermission="system:productquotation:audit">
<i class="fa fa-file-text"></i> 审核
</a>
<a class="btn btn-success" onclick="quotationConfirm()">
<a class="btn btn-success" onclick="quotationConfirm()" shiro:hasPermission="system:productquotation:confirm">
<i class="fa fa-hand-grab-o"></i> 确认
</a>
<a class="btn btn-primary" onclick="quotationApprove()">
<a class="btn btn-primary" onclick="quotationApprove()" shiro:hasPermission="system:productquotation:approve">
<i class="fa fa-hand-grab-o"></i> 核准
</a>

6
ruoyi-admin/src/main/resources/templates/system/qutsourcingquotation/qutsourcingquotation.html
View File

@ -87,15 +87,15 @@
shiro:hasPermission="system:qutsourcingquotation:export">
<i class="fa fa-download"></i> 导出
</a>
<a class="btn btn-info" onclick="quotationAudit()">
<a class="btn btn-info" onclick="quotationAudit()" shiro:hasPermission="system:qutsourcingquotation:audit">
<i class="fa fa-file-text"></i> 审核
</a>
<a class="btn btn-success" onclick="quotationConfirm()">
<a class="btn btn-success" onclick="quotationConfirm()" shiro:hasPermission="system:qutsourcingquotation:confirm">
<i class="fa fa-hand-grab-o"></i> 确认
</a>
<a class="btn btn-primary" onclick="quotationApprove()">
<a class="btn btn-primary" onclick="quotationApprove()" shiro:hasPermission="system:qutsourcingquotation:approve">
<i class="fa fa-hand-grab-o"></i> 核准
</a>

4
ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html
View File

@ -183,11 +183,11 @@
<i class="fa fa-download"></i> 导出
</a>
<a class="btn btn-info" onclick="reviewAudit()">
<a class="btn btn-info" onclick="reviewAudit()" shiro:hasPermission="system:salesOrder:audit">
<i class="fa fa-file-text"></i> 审核
</a>
<a class="btn btn-success" onclick="reviewConfirm()">
<a class="btn btn-success" onclick="reviewConfirm()" shiro:hasPermission="system:salesOrder:confirm">
<i class="fa fa-hand-grab-o"></i> 确认
</a>

6
ruoyi-admin/src/main/resources/templates/system/supplierquotation/supplierquotation.html
View File

@ -96,15 +96,15 @@
shiro:hasPermission="system:supplierquotation:export">
<i class="fa fa-download"></i> 导出
</a>
<a class="btn btn-info" onclick="quotationAudit()" shiro:hasPermission="sys:gysbj:shqr">
<a class="btn btn-info" onclick="quotationAudit()" shiro:hasPermission="system:supplierquotation:audit">
<i class="fa fa-file-text"></i> 审核
</a>
<a class="btn btn-success" onclick="quotationConfirm()"shiro:hasPermission="sys:gysbj:shqr">
<a class="btn btn-success" onclick="quotationConfirm()" shiro:hasPermission="system:supplierquotation:confirm">
<i class="fa fa-hand-grab-o"></i> 确认
</a>
<a class="btn btn-primary" onclick="quotationApprove()"shiro:hasPermission="sys:gysbj:hz">
<a class="btn btn-primary" onclick="quotationApprove()" shiro:hasPermission="system:supplierquotation:approved">
<i class="fa fa-hand-grab-o"></i> 核准
</a>

BIN
ruoyi-admin/target/classes/com/ruoyi/RuoYiApplication.class
View File

Binary file not shown.

886
ruoyi-admin/target/classes/templates/finance/customer/customer.html
View File

@ -1,461 +1,461 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
<th:block th:include="include :: header('客户资料列表')"/>
</head>
<body class="gray-bg">
<div class="container-div">
<div class="row">
<div class="col-sm-12 search-collapse">
<form id="formId">
<div class="select-list">
<ul>
<li>
<label>企业代码：</label>
<input type="text" name="pCode"/>
</li>
<li>
<label>企业名称：</label>
<input type="text" name="pName"/>
</li>
<li>
<label>内外销：</label><select name="NWX" th:with="type=${@dict.getType('sys_NWX_class')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
th:value="${dict.dictValue}"></option>
</select>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
class="fa fa-refresh"></i>&nbsp;重置</a>
</li>
</ul>
</div>
</form>
</div>
<!--<!DOCTYPE html>-->
<!--<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">-->
<!--<head>-->
<!-- <th:block th:include="include :: header('客户资料列表')"/>-->
<!--</head>-->
<!--<body class="gray-bg">-->
<!--<div class="container-div">-->
<!-- <div class="row">-->
<!-- <div class="col-sm-12 search-collapse">-->
<!-- <form id="formId">-->
<!-- <div class="select-list">-->
<!-- <ul>-->
<!-- <li>-->
<!-- <label>企业代码：</label>-->
<!-- <input type="text" name="pCode"/>-->
<!-- </li>-->
<!-- <li>-->
<!-- <label>企业名称：</label>-->
<!-- <input type="text" name="pName"/>-->
<!-- </li>-->
<!-- <li>-->
<!-- <label>内外销：</label><select name="NWX" th:with="type=${@dict.getType('sys_NWX_class')}">-->
<!-- <option value="">所有</option>-->
<!-- <option th:each="dict : ${type}" th:text="${dict.dictLabel}"-->
<!-- th:value="${dict.dictValue}"></option>-->
<!-- </select>-->
<!-- </li>-->
<!-- <li>-->
<!-- <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i-->
<!-- class="fa fa-search"></i>&nbsp;搜索</a>-->
<!-- <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i-->
<!-- class="fa fa-refresh"></i>&nbsp;重置</a>-->
<!-- </li>-->
<!-- </ul>-->
<!-- </div>-->
<!-- </form>-->
<!-- </div>-->
<div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="finance:customer:add">
<i class="fa fa-plus"></i> 添加
</a>
<a class="btn btn-primary single disabled" onclick="$.operate.edit()"
shiro:hasPermission="finance:customer:edit">
<i class="fa fa-edit"></i> 修改
</a>
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()"
shiro:hasPermission="finance:customer:remove">
<i class="fa fa-remove"></i> 删除
</a>
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="finance:customer:export">
<i class="fa fa-download"></i> 导出
</a>
<a class="btn btn-success single disabled" onclick="comfirm()"
shiro:hasPermission="finance:customer:export">
<i class="glyphicon glyphicon-ok"></i> 确认
</a>
</div>
<div class="col-sm-12 select-table table-striped table-single">
<table id="bootstrap-table"></table>
</div>
</div>
</div>
<th:block th:include="include :: footer"/>
<script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('finance:customer:edit')}]];
var removeFlag = [[${@permission.hasPermi('finance:customer:remove')}]];
var prefix = ctx + "finance/customer";
<!-- <div class="btn-group-sm" id="toolbar" role="group">-->
<!-- <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="finance:customer:add">-->
<!-- <i class="fa fa-plus"></i> 添加-->
<!-- </a>-->
<!-- <a class="btn btn-primary single disabled" onclick="$.operate.edit()"-->
<!-- shiro:hasPermission="finance:customer:edit">-->
<!-- <i class="fa fa-edit"></i> 修改-->
<!-- </a>-->
<!-- <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()"-->
<!-- shiro:hasPermission="finance:customer:remove">-->
<!-- <i class="fa fa-remove"></i> 删除-->
<!-- </a>-->
<!-- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="finance:customer:export">-->
<!-- <i class="fa fa-download"></i> 导出-->
<!-- </a>-->
<!-- <a class="btn btn-success single disabled" onclick="comfirm()"-->
<!-- shiro:hasPermission="finance:customer:export">-->
<!-- <i class="glyphicon glyphicon-ok"></i> 确认-->
<!-- </a>-->
<!-- </div>-->
<!-- <div class="col-sm-12 select-table table-striped table-single">-->
<!-- <table id="bootstrap-table"></table>-->
<!-- </div>-->
<!-- </div>-->
<!--</div>-->
<!--<th:block th:include="include :: footer"/>-->
<!--<script th:inline="javascript">-->
<!-- var editFlag = [[${@permission.hasPermi('finance:customer:edit')}]];-->
<!-- var removeFlag = [[${@permission.hasPermi('finance:customer:remove')}]];-->
<!-- var prefix = ctx + "finance/customer";-->
$(function () {
var options = {
url: prefix + "/list",
createUrl: prefix + "/add",
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export",
onClickRow: onClickRow,//行点击事件
modalName: "客户资料",
columns: [{
checkbox: true
},
{
field: 'pCode',
title: '企业代码'
},
{
field: 'pName',
title: '企业名称'
},
{
field: 'pEnName',
title: '企业英文名称',
formatter: function (value, row, index) {
return $.table.tooltip(value);
},
visible: false
},
{
field: 'pAddress',
title: '地址',
visible: false
},
{
field: 'pPost',
title: '邮编',
visible: false
},
{
field: 'pCountry',
title: '国家地区',
visible: false
},
{
field: 'pCeo',
title: '法人代表',
visible: false
},
{
field: 'pLinkman',
title: '联系人'
},
{
field: 'pTel',
title: '联系电话',
formatter: function (value, row, index) {
return $.table.tooltip(value);
}
},
{
field: 'pFax',
title: '传真',
visible: false
},
{
field: 'pEmail',
title: 'EMAIL',
formatter: function (value, row, index) {
return $.table.tooltip(value);
}
},
{
field: 'pHttp',
title: '客户简称',
visible: false
},
{
field: 'pCiqCode',
title: '',
visible: false
},
{
field: 'pComCode',
title: '付款条件',
formatter: function (value, row, index) {
return $.table.tooltip(value);
}
},
{
field: 'pHyCode',
title: '发票代码',
formatter: function (value, row, index) {
return $.table.tooltip(value);
}
},
{
field: 'pCreatDate',
title: '成立时间',
visible: false
},
{
field: 'pJhbank',
title: '结汇银行',
visible: false
},
{
field: 'pJhbankCode',
title: '结汇账号',
visible: false
},
{
field: 'pBank',
title: '开户银行',
visible: false
},
{
field: 'pBankCode',
title: '开户银行账号',
visible: false
},
{
field: 'pRmbMoney',
title: '人民币注册资金',
visible: false
},
{
field: 'pWbType',
title: '送货地址',
formatter: function (value, row, index) {
return $.table.tooltip(value);
}
},
{
field: 'pWbMoney',
title: '外币注册资金',
visible: false
},
{
field: 'memoText',
title: '备注内容',
visible: false
},
{
field: 'moral',
title: '诚信评级',
visible: false
},
{
field: 'comfirmDate',
title: '确认时间',
visible: false
},
{
field: 'writeMan',
title: '制单人名',
visible: false
},
{
field: 'writeDate',
title: '',
visible: false
},
{
field: 'creditAmt',
title: '信用额度',
visible: false
},
{
field: 'NWX',
title: '内外销',
visible: false
},
{
field: 'ordernoLen',
title: '订单号长度'
},
{
field: 'sendcpReportname',
title: '出货单格式名称',
visible: false
},
{
field: 'saler',
title: '业务员'
},
{
field: 'dWaterNo',
title: '目的地港代号',
visible: false
},
{
field: 'sWaterName',
title: '起运港名',
visible: false
},
{
field: 'crlName',
title: '币别',
visible: false
},
{
field: 'pCountryCode',
title: '国家地区编号'
},
{
field: 'senduseConfirm',
title: '出货需录入使用量',
visible: false
},
{
field: 'taxPercent',
title: '税率',
visible: false
},
{
field: 'senddw',
title: '',
visible: false
},
{
field: 'taxFlag',
title: '含税否',
visible: false
},
{
field: 'comfirmFlag',
title: '确认否',
formatter: function (value, row, index) {
if (value == 1){
value = "是"
return value
} else {
value = "否"
return value
}
}
},
{
field: 'comfirmMan',
title: '确认人',
},
{
title: '操作',
align: 'center',
formatter: function (value, row, index) {
var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.pCode + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.pCode + '\')"><i class="fa fa-remove"></i>删除</a>');
return actions.join('');
}
}]
};
$.table.init(options);
});
<!-- $(function () {-->
<!-- var options = {-->
<!-- url: prefix + "/list",-->
<!-- createUrl: prefix + "/add",-->
<!-- updateUrl: prefix + "/edit/{id}",-->
<!-- removeUrl: prefix + "/remove",-->
<!-- exportUrl: prefix + "/export",-->
<!-- onClickRow: onClickRow,//行点击事件-->
<!-- modalName: "客户资料",-->
<!-- columns: [{-->
<!-- checkbox: true-->
<!-- },-->
<!-- {-->
<!-- field: 'pCode',-->
<!-- title: '企业代码'-->
<!-- },-->
<!-- {-->
<!-- field: 'pName',-->
<!-- title: '企业名称'-->
<!-- },-->
<!-- {-->
<!-- field: 'pEnName',-->
<!-- title: '企业英文名称',-->
<!-- formatter: function (value, row, index) {-->
<!-- return $.table.tooltip(value);-->
<!-- },-->
<!-- visible: false-->
<!-- },-->
<!-- {-->
<!-- field: 'pAddress',-->
<!-- title: '地址',-->
<!-- visible: false-->
<!-- },-->
<!-- {-->
<!-- field: 'pPost',-->
<!-- title: '邮编',-->
<!-- visible: false-->
<!-- },-->
<!-- {-->
<!-- field: 'pCountry',-->
<!-- title: '国家地区',-->
<!-- visible: false-->
<!-- },-->
<!-- {-->
<!-- field: 'pCeo',-->
<!-- title: '法人代表',-->
<!-- visible: false-->
<!-- },-->
<!-- {-->
<!-- field: 'pLinkman',-->
<!-- title: '联系人'-->
<!-- },-->
<!-- {-->
<!-- field: 'pTel',-->
<!-- title: '联系电话',-->
<!-- formatter: function (value, row, index) {-->
<!-- return $.table.tooltip(value);-->
<!-- }-->
<!-- },-->
<!-- {-->
<!-- field: 'pFax',-->
<!-- title: '传真',-->
<!-- visible: false-->
<!-- },-->
<!-- {-->
<!-- field: 'pEmail',-->
<!-- title: 'EMAIL',-->
<!-- formatter: function (value, row, index) {-->
<!-- return $.table.tooltip(value);-->
<!-- }-->
<!-- },-->
<!-- {-->
<!-- field: 'pHttp',-->
<!-- title: '客户简称',-->
<!-- visible: false-->
<!-- },-->
<!-- {-->
<!-- field: 'pCiqCode',-->
<!-- title: '',-->
<!-- visible: false-->
<!-- },-->
<!-- {-->
<!-- field: 'pComCode',-->
<!-- title: '付款条件',-->
<!-- formatter: function (value, row, index) {-->
<!-- return $.table.tooltip(value);-->
<!-- }-->
<!-- },-->
<!-- {-->
<!-- field: 'pHyCode',-->
<!-- title: '发票代码',-->
<!-- formatter: function (value, row, index) {-->
<!-- return $.table.tooltip(value);-->
<!-- }-->
<!-- },-->
<!-- {-->
<!-- field: 'pCreatDate',-->
<!-- title: '成立时间',-->
<!-- visible: false-->
<!-- },-->
<!-- {-->
<!-- field: 'pJhbank',-->
<!-- title: '结汇银行',-->
<!-- visible: false-->
<!-- },-->
<!-- {-->
<!-- field: 'pJhbankCode',-->
<!-- title: '结汇账号',-->
<!-- visible: false-->
<!-- },-->
<!-- {-->
<!-- field: 'pBank',-->
<!-- title: '开户银行',-->
<!-- visible: false-->
<!-- },-->
<!-- {-->
<!-- field: 'pBankCode',-->
<!-- title: '开户银行账号',-->
<!-- visible: false-->
<!-- },-->
<!-- {-->
<!-- field: 'pRmbMoney',-->
<!-- title: '人民币注册资金',-->
<!-- visible: false-->
<!-- },-->
<!-- {-->
<!-- field: 'pWbType',-->
<!-- title: '送货地址',-->
<!-- formatter: function (value, row, index) {-->
<!-- return $.table.tooltip(value);-->
<!-- }-->
<!-- },-->
<!-- {-->
<!-- field: 'pWbMoney',-->
<!-- title: '外币注册资金',-->
<!-- visible: false-->
<!-- },-->
<!-- {-->
<!-- field: 'memoText',-->
<!-- title: '备注内容',-->
<!-- visible: false-->
<!-- },-->
<!-- {-->
<!-- field: 'moral',-->
<!-- title: '诚信评级',-->
<!-- visible: false-->
<!-- },-->
<!-- {-->
<!-- field: 'comfirmDate',-->
<!-- title: '确认时间',-->
<!-- visible: false-->
<!-- },-->
<!-- {-->
<!-- field: 'writeMan',-->
<!-- title: '制单人名',-->
<!-- visible: false-->
<!-- },-->
<!-- {-->
<!-- field: 'writeDate',-->
<!-- title: '',-->
<!-- visible: false-->
<!-- },-->
<!-- {-->
<!-- field: 'creditAmt',-->
<!-- title: '信用额度',-->
<!-- visible: false-->
<!-- },-->
<!-- {-->
<!-- field: 'NWX',-->
<!-- title: '内外销',-->
<!-- visible: false-->
<!-- },-->
<!-- {-->
<!-- field: 'ordernoLen',-->
<!-- title: '订单号长度'-->
<!-- },-->
<!-- {-->
<!-- field: 'sendcpReportname',-->
<!-- title: '出货单格式名称',-->
<!-- visible: false-->
<!-- },-->
<!-- {-->
<!-- field: 'saler',-->
<!-- title: '业务员'-->
<!-- },-->
<!-- {-->
<!-- field: 'dWaterNo',-->
<!-- title: '目的地港代号',-->
<!-- visible: false-->
<!-- },-->
<!-- {-->
<!-- field: 'sWaterName',-->
<!-- title: '起运港名',-->
<!-- visible: false-->
<!-- },-->
<!-- {-->
<!-- field: 'crlName',-->
<!-- title: '币别',-->
<!-- visible: false-->
<!-- },-->
<!-- {-->
<!-- field: 'pCountryCode',-->
<!-- title: '国家地区编号'-->
<!-- },-->
<!-- {-->
<!-- field: 'senduseConfirm',-->
<!-- title: '出货需录入使用量',-->
<!-- visible: false-->
<!-- },-->
<!-- {-->
<!-- field: 'taxPercent',-->
<!-- title: '税率',-->
<!-- visible: false-->
<!-- },-->
<!-- {-->
<!-- field: 'senddw',-->
<!-- title: '',-->
<!-- visible: false-->
<!-- },-->
<!-- {-->
<!-- field: 'taxFlag',-->
<!-- title: '含税否',-->
<!-- visible: false-->
<!-- },-->
<!-- {-->
<!-- field: 'comfirmFlag',-->
<!-- title: '确认否',-->
<!-- formatter: function (value, row, index) {-->
<!-- if (value == 1){-->
<!-- value = "是"-->
<!-- return value-->
<!-- } else {-->
<!-- value = "否"-->
<!-- return value-->
<!-- }-->
<!-- }-->
<!-- },-->
<!-- {-->
<!-- field: 'comfirmMan',-->
<!-- title: '确认人',-->
<!-- },-->
<!-- {-->
<!-- title: '操作',-->
<!-- align: 'center',-->
<!-- formatter: function (value, row, index) {-->
<!-- var actions = [];-->
<!-- actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.pCode + '\')"><i class="fa fa-edit"></i>编辑</a> ');-->
<!-- actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.pCode + '\')"><i class="fa fa-remove"></i>删除</a>');-->
<!-- return actions.join('');-->
<!-- }-->
<!-- }]-->
<!-- };-->
<!-- $.table.init(options);-->
<!-- });-->
// 获取记录总数
// $("#bootstrap-table").on("load-success.bs.table", function () {
// var total_row_num1 = $('#bootstrap-table').bootstrapTable('getOptions').totalRows;
// console.log(total_row_num1)
// });
<!-- // 获取记录总数-->
<!-- // $("#bootstrap-table").on("load-success.bs.table", function () {-->
<!-- // var total_row_num1 = $('#bootstrap-table').bootstrapTable('getOptions').totalRows;-->
<!-- // console.log(total_row_num1)-->
<!-- // });-->
Date.prototype.Format = function (fmt) {
var o = {
"M+": this.getMonth() + 1, //月份
"d+": this.getDate(), //日
"H+": this.getHours(), //小时
"m+": this.getMinutes(), //分
"s+": this.getSeconds(), //秒
"q+": Math.floor((this.getMonth() + 3) / 3), //季度
"S": this.getMilliseconds() //毫秒
};
if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));
for (var k in o)
if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
return fmt;
}
<!-- Date.prototype.Format = function (fmt) {-->
<!-- var o = {-->
<!-- "M+": this.getMonth() + 1, //月份-->
<!-- "d+": this.getDate(), //日-->
<!-- "H+": this.getHours(), //小时-->
<!-- "m+": this.getMinutes(), //分-->
<!-- "s+": this.getSeconds(), //秒-->
<!-- "q+": Math.floor((this.getMonth() + 3) / 3), //季度-->
<!-- "S": this.getMilliseconds() //毫秒-->
<!-- };-->
<!-- if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));-->
<!-- for (var k in o)-->
<!-- if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));-->
<!-- return fmt;-->
<!-- }-->
function comfirm() {
table.set();
$.modal.confirm("你确定数据正确，决定要确认吗？确认的记录不能删或修改 ", function () {
var P_Code = $.table.selectFirstColumns();
var userName = [[${@permission.getPrincipalProperty('userName')}]];
var date = new Date().Format("yyyy-MM-dd HH:mm:ss");
var editList = {"Id": P_Code.join(), "Name": userName, "Date": date}
var key = "comfirm";
var value = "comfirm";
var url = prefix + "/edit/comfirm";
editList[key] = value
$.operate.submit(url, "post", "json", editList);
});
}
<!-- function comfirm() {-->
<!-- table.set();-->
<!-- $.modal.confirm("你确定数据正确，决定要确认吗？确认的记录不能删或修改 ", function () {-->
<!-- var P_Code = $.table.selectFirstColumns();-->
<!-- var userName = [[${@permission.getPrincipalProperty('userName')}]];-->
<!-- var date = new Date().Format("yyyy-MM-dd HH:mm:ss");-->
<!-- var editList = {"Id": P_Code.join(), "Name": userName, "Date": date}-->
<!-- var key = "comfirm";-->
<!-- var value = "comfirm";-->
<!-- var url = prefix + "/edit/comfirm";-->
<!-- editList[key] = value-->
<!-- $.operate.submit(url, "post", "json", editList);-->
<!-- });-->
<!-- }-->
function onClickRow(row) {
// console.log("row"+JSON.stringify(row))
<!-- function onClickRow(row) {-->
<!-- // console.log("row"+JSON.stringify(row))-->
// $("#pCode").val(row.pCode);
// $("#pName").val(row.pName);
// $("#pEnName").val(row.pEnName);
// $("#pAddress").val(row.pAddress);
// $("#pWbType").val(row.pWbType);
// $("#pPost").val(row.pPost);
// $("#pCeo").val(row.pCeo);
//
// $("#memoText").val(row.memoText);
// $("#writeMan").val(row.writeMan);
// $("#comfirmMan").val(row.comfirmMan);
//
// $("#pLinkman").val(row.pLinkman);
// $("#pTel").val(row.pTel);
// $("#pFax").val(row.pFax);
// $("#pEmail").val(row.pEmail);
// $("#pHttp").val(row.pHttp);
// $("#pCiqCode").val(row.pCiqCode);
// $("#pComCode").val(row.pComCode);
// $("#pHyCode").val(row.pHyCode);
//
// $("#pType").val(row.pType);
// // $("#pCreatDate").val(row.pCreatDate);
// $("#pJhbank").val(row.pJhbank);
// $("#pJhbankCode").val(row.pJhbankCode);
// $("#pBank").val(row.pBank);
// $("#pBankCode").val(row.pBankCode);
// $("#pRmbMoney").val(row.pRmbMoney);
// $("#pWbMoney").val(row.pWbMoney);
// $("#ordernoLen").val(row.ordernoLen);
// // $("#saler").val(row.saler);
// $("#sendcpReportname").val(row.sendcpReportname);
//
// $("#dWaterNo").val(row.dWaterNo);
// $("#sWaterName").val(row.sWaterName);
// $("#sWaterNo").val(row.sWaterNo);
// $("#comCode").val(row.comCode);
// $("#crlName").val(row.crlName);
// $("#creditAmt").val(row.creditAmt);
// $("#ordernoLen").val(row.ordernoLen);
// $("#moral").val(row.moral);
// $("#senduseConfirm").val(row.senduseConfirm);
// $("#pCountry").val(row.pCountry);
// $("#pCountryCode").val(row.pCountryCode);
}
</script>
</body>
<style>
.label-100px li label:not(.radio-box) {
width: 110px;
}
<!-- // $("#pCode").val(row.pCode);-->
<!-- // $("#pName").val(row.pName);-->
<!-- // $("#pEnName").val(row.pEnName);-->
<!-- // $("#pAddress").val(row.pAddress);-->
<!-- // $("#pWbType").val(row.pWbType);-->
<!-- // $("#pPost").val(row.pPost);-->
<!-- // $("#pCeo").val(row.pCeo);-->
<!-- //-->
<!-- // $("#memoText").val(row.memoText);-->
<!-- // $("#writeMan").val(row.writeMan);-->
<!-- // $("#comfirmMan").val(row.comfirmMan);-->
<!-- //-->
<!-- // $("#pLinkman").val(row.pLinkman);-->
<!-- // $("#pTel").val(row.pTel);-->
<!-- // $("#pFax").val(row.pFax);-->
<!-- // $("#pEmail").val(row.pEmail);-->
<!-- // $("#pHttp").val(row.pHttp);-->
<!-- // $("#pCiqCode").val(row.pCiqCode);-->
<!-- // $("#pComCode").val(row.pComCode);-->
<!-- // $("#pHyCode").val(row.pHyCode);-->
<!-- //-->
<!-- // $("#pType").val(row.pType);-->
<!-- // // $("#pCreatDate").val(row.pCreatDate);-->
<!-- // $("#pJhbank").val(row.pJhbank);-->
<!-- // $("#pJhbankCode").val(row.pJhbankCode);-->
<!-- // $("#pBank").val(row.pBank);-->
<!-- // $("#pBankCode").val(row.pBankCode);-->
<!-- // $("#pRmbMoney").val(row.pRmbMoney);-->
<!-- // $("#pWbMoney").val(row.pWbMoney);-->
<!-- // $("#ordernoLen").val(row.ordernoLen);-->
<!-- // // $("#saler").val(row.saler);-->
<!-- // $("#sendcpReportname").val(row.sendcpReportname);-->
<!-- //-->
<!-- // $("#dWaterNo").val(row.dWaterNo);-->
<!-- // $("#sWaterName").val(row.sWaterName);-->
<!-- // $("#sWaterNo").val(row.sWaterNo);-->
<!-- // $("#comCode").val(row.comCode);-->
<!-- // $("#crlName").val(row.crlName);-->
<!-- // $("#creditAmt").val(row.creditAmt);-->
<!-- // $("#ordernoLen").val(row.ordernoLen);-->
<!-- // $("#moral").val(row.moral);-->
<!-- // $("#senduseConfirm").val(row.senduseConfirm);-->
<!-- // $("#pCountry").val(row.pCountry);-->
<!-- // $("#pCountryCode").val(row.pCountryCode);-->
<!-- }-->
<!--</script>-->
<!--</body>-->
<!--<style>-->
<!-- .label-100px li label:not(.radio-box) {-->
<!-- width: 110px;-->
<!-- }-->
.parallel {
width: 50%;
height: 30px;
float: left
}
<!-- .parallel {-->
<!-- width: 50%;-->
<!-- height: 30px;-->
<!-- float: left-->
<!-- }-->
#ordernoLen {
width: 50px;
}
<!-- #ordernoLen {-->
<!-- width: 50px;-->
<!-- }-->
#saler {
width: 86px;
}
<!-- #saler {-->
<!-- width: 86px;-->
<!-- }-->
#parallel-r {
width: 108px;
}
<!-- #parallel-r {-->
<!-- width: 108px;-->
<!-- }-->
#parallel-r {
text-align: left;
width: 55px;
}
<!-- #parallel-r {-->
<!-- text-align: left;-->
<!-- width: 55px;-->
<!-- }-->
#memoText {
width: 570px;
height: 66px;
display: inline;
}
<!-- #memoText {-->
<!-- width: 570px;-->
<!-- height: 66px;-->
<!-- display: inline;-->
<!-- }-->
.nema {
width: 200px;
float: left;
}
<!-- .nema {-->
<!-- width: 200px;-->
<!-- float: left;-->
<!-- }-->
#writeMan {
width: 120px;
}
<!-- #writeMan {-->
<!-- width: 120px;-->
<!-- }-->
#comfirmMan {
width: 120px;
}
</style>
</html>
<!-- #comfirmMan {-->
<!-- width: 120px;-->
<!-- }-->
<!--</style>-->
<!--</html>-->

1
ruoyi-admin/target/classes/templates/manufacture/deliveryGoodsDetail/deliveryGoodsDetail.html
View File

@ -165,6 +165,7 @@
};
$.table.init(options);
});
</script>
</body>
</html>

9
ruoyi-admin/target/classes/templates/purchase/purchaseOrder/purchaseOrder.html
View File

@ -82,16 +82,17 @@
<a class="btn btn-warning" onclick="exportPurchaseOrder()" shiro:hasPermission="purchase:purchaseOrder:export">
<i class="fa fa-download"></i> 导出
</a>
<a class="btn btn-primary" onclick="reviewCloseCase()">
<a class="btn btn-primary" onclick="reviewCloseCase()" shiro:hasPermission="purchase:purchaseOrder:close">
<i class="fa fa-hand-grab-o"></i> 结案
</a>
<a class="btn btn-primary" onclick="reviewConfirm()">
<a class="btn btn-primary" onclick="reviewConfirm()" shiro:hasPermission="purchase:purchaseOrder:confirm">
<i class="fa fa-hand-grab-o"></i> 确认
</a>
<a class="btn btn-primary" onclick="reviewAudit()">
<a class="btn btn-primary" onclick="reviewAudit()" shiro:hasPermission="purchase:purchaseOrder:audit">
<i class="fa fa-hand-grab-o"></i> 审核
</a>
<a class="btn btn-primary" onclick="reviewApprove()">
<a class="btn btn-primary" onclick="reviewApprove()" shiro:hasPermission="purchase:purchaseOrder:approve">
<i class="fa fa-hand-grab-o"></i> 核准
</a>
</div>

4
ruoyi-admin/target/classes/templates/returnGoods/returnGoodsOrder/returnGoodsOrder.html
View File

@ -124,10 +124,10 @@
<a class="btn btn-warning" onclick="exportOrderDetail()">
<i class="fa fa-download"></i> 导出订单详情
</a>
<a class="btn btn-success" onclick="closeCaseOrder()">
<a class="btn btn-success" onclick="closeCaseOrder()" shiro:hasPermission="returnGoods:returnGoodsOrder:close">
<i class="fa fa-hand-grab-o"></i> 结案
</a>
<a class="btn btn-success" onclick="confirmOrder()">
<a class="btn btn-success" onclick="confirmOrder()" shiro:hasPermission="returnGoods:returnGoodsOrder:confirm">
<i class="fa fa-hand-grab-o"></i> 确认
</a>
</div>

78
ruoyi-admin/target/classes/templates/sales/salesAccountReconciliation/salesAccountReconciliation.html
View File

@ -21,9 +21,11 @@
<ul>
<li class="select-time">
<label>创建时间： </label>
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
<input type="text" class="time-input" id="startTime" placeholder="开始时间"
name="params[beginTime]"/>
<span>-</span>
<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
<input type="text" class="time-input" id="endTime" placeholder="结束时间"
name="params[endTime]"/>
</li>
<li>
<label>订单号码：</label>
@ -45,21 +47,24 @@
<label>客户使用否：</label>
<select name="customerUseOrNot" th:with="type=${@dict.getType('sys_whether')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
th:value="${dict.dictValue}"></option>
</select>
</li>
<li>
<label>对账否：</label>
<select name="accountReconciliationOrNot" th:with="type=${@dict.getType('sys_whether')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
th:value="${dict.dictValue}"></option>
</select>
</li>
<li>
<label>是否开国税发票：</label>
<select name="nationalTaxBill" th:with="type=${@dict.getType('sys_whether')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
th:value="${dict.dictValue}"></option>
</select>
</li>
<li>
@ -71,8 +76,10 @@
<input type="text" name="finishProductName"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="searchAll()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="resetAll()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
<a class="btn btn-primary btn-rounded btn-sm" onclick="searchAll()"><i
class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="resetAll()"><i
class="fa fa-refresh"></i>&nbsp;重置</a>
</li>
</ul>
</div>
@ -93,13 +100,16 @@
<!-- <i class="fa fa-download"></i> 导出-->
<!-- </a>-->
<b>销售信息</b>
<a class="btn btn-success" onclick="confirmAccountReconciliation()">
<a class="btn btn-success" onclick="confirmAccountReconciliation()"
shiro:hasPermission="salesAccountReconciliation:salesAccountReconciliation:confirm">
<i class="fa fa-hand-grab-o"></i> 销售对账确认
</a>
<a class="btn btn-success" onclick="confirmCustomerUse()">
<a class="btn btn-success" onclick="confirmCustomerUse()"
shiro:hasPermission="salesAccountReconciliation:salesAccountReconciliation:customConfirm">
<i class="fa fa-hand-grab-o"></i> 客户使用确认
</a>
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="salesAccountReconciliation:salesAccountReconciliation:export">
<a class="btn btn-warning" onclick="$.table.exportExcel()"
shiro:hasPermission="salesAccountReconciliation:salesAccountReconciliation:export">
<i class="fa fa-download"></i> 导出
</a>
<!-- <a class="btn btn-primary" onclick="toNationalTaxBill()">-->
@ -108,7 +118,8 @@
</div>
<div class="btn-group-sm" id="toolbar1" role="group">
<b>退货信息</b>
<a class="btn btn-success" onclick="confirmRGAccountReconciliation()">
<a class="btn btn-success" onclick="confirmRGAccountReconciliation()"
shiro:hasPermission="salesAccountReconciliation:salesAccountReconciliation:returnConfirm">
<i class="fa fa-hand-grab-o"></i> 退货对账确认
</a>
<a class="btn btn-warning" onclick="exportRGExcel('formId')">
@ -146,22 +157,26 @@
<div class="form-group">
<label class="col-sm-3 control-label">对账否：</label>
<div class="col-sm-8">
<select id="accountReconciliationOrNot" name="accountReconciliationOrNot" class="form-control" th:with="type=${@dict.getType('sys_whether')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
<select id="accountReconciliationOrNot" name="accountReconciliationOrNot"
class="form-control" th:with="type=${@dict.getType('sys_whether')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">对账人：</label>
<div class="col-sm-8">
<input id="accountReconciliationPerson" name="accountReconciliationPerson" class="form-control" type="text">
<input id="accountReconciliationPerson" name="accountReconciliationPerson"
class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">对账时间：</label>
<div class="col-sm-8">
<div class="input-group date">
<input id="accountReconciliationTime" name="accountReconciliationTime" class="form-control" placeholder="yyyy-mm-dd hh:ii:ss" type="text">
<input id="accountReconciliationTime" name="accountReconciliationTime"
class="form-control" placeholder="yyyy-mm-dd hh:ii:ss" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
@ -192,7 +207,8 @@
<div class="form-group" style="display: none">
<label class="col-sm-4 control-label is-required">订单id：</label>
<div class="col-sm-8">
<input id="salesFinishId1" name="salesFinishId" class="form-control" type="text" required readonly>
<input id="salesFinishId1" name="salesFinishId" class="form-control" type="text" required
readonly>
</div>
</div>
<div class="form-group">
@ -204,20 +220,24 @@
<div class="form-group">
<label class="col-sm-4 control-label is-required">成品代码：</label>
<div class="col-sm-8">
<input id="finishProductCode" name="finishProductCode" class="form-control" type="text" required>
<input id="finishProductCode" name="finishProductCode" class="form-control" type="text"
required>
</div>
</div>
<div class="form-group">
<label class="col-sm-4 control-label is-required">成品名称：</label>
<div class="col-sm-8">
<input id="finishProductName" name="finishProductName" class="form-control" type="text" required>
<input id="finishProductName" name="finishProductName" class="form-control" type="text"
required>
</div>
</div>
<div class="form-group">
<label class="col-sm-4 control-label">客户使用否：</label>
<div class="col-sm-8">
<select id="customerUseOrNot" name="customerUseOrNot" class="form-control" th:with="type=${@dict.getType('sys_whether')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
<select id="customerUseOrNot" name="customerUseOrNot" class="form-control"
th:with="type=${@dict.getType('sys_whether')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
@ -231,7 +251,8 @@
<label class="col-sm-4 control-label">备注：</label>
<div class="col-sm-8">
<!-- <input id="customerUseRemarks" name="customerUseRemarks" class="form-control" type="text">-->
<textarea id="customerUseRemarks" name="customerUseRemarks" style="width: 100%;" rows="4"></textarea>
<textarea id="customerUseRemarks" name="customerUseRemarks" style="width: 100%;"
rows="4"></textarea>
</div>
</div>
</form>
@ -260,29 +281,34 @@
<div class="form-group" style="display: none">
<label class="col-sm-3 control-label is-required">退货产品id：</label>
<div class="col-sm-8">
<input id="returnGoodsProductId" name="returnGoodsProductId" class="form-control" type="text" required
<input id="returnGoodsProductId" name="returnGoodsProductId" class="form-control"
type="text" required
readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">对账否：</label>
<div class="col-sm-8">
<select id="accountReconciliationOrNot1" name="accountReconciliationOrNot" class="form-control" th:with="type=${@dict.getType('sys_whether')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
<select id="accountReconciliationOrNot1" name="accountReconciliationOrNot"
class="form-control" th:with="type=${@dict.getType('sys_whether')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">对账人：</label>
<div class="col-sm-8">
<input id="accountReconciliationPerson1" name="accountReconciliationPerson" class="form-control" type="text">
<input id="accountReconciliationPerson1" name="accountReconciliationPerson"
class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">对账时间：</label>
<div class="col-sm-8">
<div class="input-group date">
<input id="accountReconciliationTime1" name="accountReconciliationTime" class="form-control" placeholder="yyyy-mm-dd hh:ii:ss" type="text">
<input id="accountReconciliationTime1" name="accountReconciliationTime"
class="form-control" placeholder="yyyy-mm-dd hh:ii:ss" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>

2
ruoyi-admin/target/classes/templates/system/bom/bom.html
View File

@ -72,7 +72,7 @@
<a class="btn btn-warning" onclick="exportBomDetail()" shiro:hasPermission="system:bom:export">
<i class="fa fa-download"></i> 单个导出
</a>
<a class="btn btn-success" onclick="bomConfirm()">
<a class="btn btn-success" onclick="bomConfirm()" shiro:hasPermission="system:bom:confirm">
<i class="fa fa-hand-grab-o"></i> 确认
</a>

4
ruoyi-admin/target/classes/templates/system/customer/customer.html
View File

@ -109,10 +109,10 @@
<!-- <a class="btn btn-danger" onclick="oneexport()" shiro:hasPermission="system:customer:export">-->
<!-- <i class="fa fa-download"></i> 单个导出-->
<!-- </a>-->
<a class="btn btn-success" id="tocontacts" onclick="addContacts()">
<a class="btn btn-success" id="tocontacts" onclick="addContacts()" shiro:hasPermission="system:contacts:add">
<i class="fa fa-plus"></i> 添加联系人明细
</a>
<a class="btn btn-primary" onclick="showaddress()">
<a class="btn btn-primary" onclick="showaddress()" shiro:hasPermission="system:shippingaddress:add">
<i class="fa fa-ambulance"></i> 添加送货地址
</a>

6
ruoyi-admin/target/classes/templates/system/productquotation/productquotation.html
View File

@ -103,15 +103,15 @@
shiro:hasPermission="system:productquotation:export">
<i class="fa fa-download"></i> 导出
</a>
<a class="btn btn-info" onclick="quotationAudit()">
<a class="btn btn-info" onclick="quotationAudit()" shiro:hasPermission="system:productquotation:audit">
<i class="fa fa-file-text"></i> 审核
</a>
<a class="btn btn-success" onclick="quotationConfirm()">
<a class="btn btn-success" onclick="quotationConfirm()" shiro:hasPermission="system:productquotation:confirm">
<i class="fa fa-hand-grab-o"></i> 确认
</a>
<a class="btn btn-primary" onclick="quotationApprove()">
<a class="btn btn-primary" onclick="quotationApprove()" shiro:hasPermission="system:productquotation:approve">
<i class="fa fa-hand-grab-o"></i> 核准
</a>

6
ruoyi-admin/target/classes/templates/system/qutsourcingquotation/qutsourcingquotation.html
View File

@ -87,15 +87,15 @@
shiro:hasPermission="system:qutsourcingquotation:export">
<i class="fa fa-download"></i> 导出
</a>
<a class="btn btn-info" onclick="quotationAudit()">
<a class="btn btn-info" onclick="quotationAudit()" shiro:hasPermission="system:qutsourcingquotation:audit">
<i class="fa fa-file-text"></i> 审核
</a>
<a class="btn btn-success" onclick="quotationConfirm()">
<a class="btn btn-success" onclick="quotationConfirm()" shiro:hasPermission="system:qutsourcingquotation:confirm">
<i class="fa fa-hand-grab-o"></i> 确认
</a>
<a class="btn btn-primary" onclick="quotationApprove()">
<a class="btn btn-primary" onclick="quotationApprove()" shiro:hasPermission="system:qutsourcingquotation:approve">
<i class="fa fa-hand-grab-o"></i> 核准
</a>

8
ruoyi-admin/target/classes/templates/system/salesOrder/salesOrder.html
View File

@ -107,7 +107,7 @@
<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
</li>
<li>
<label>订单1111编号：</label>
<label>订单编号：</label>
<input type="text" name="salesOrderCode"/>
</li>
<li>
@ -115,7 +115,7 @@
<input type="text" name="salesOrderNumber"/>
</li>
<li>
<label>预约2222单号：</label>
<label>预约单号：</label>
<input type="text" name="appointmentNumber"/>
</li>
<li>
@ -183,11 +183,11 @@
<i class="fa fa-download"></i> 导出
</a>
<a class="btn btn-info" onclick="reviewAudit()">
<a class="btn btn-info" onclick="reviewAudit()" shiro:hasPermission="system:salesOrder:audit">
<i class="fa fa-file-text"></i> 审核
</a>
<a class="btn btn-success" onclick="reviewConfirm()">
<a class="btn btn-success" onclick="reviewConfirm()" shiro:hasPermission="system:salesOrder:confirm">
<i class="fa fa-hand-grab-o"></i> 确认
</a>

6
ruoyi-admin/target/classes/templates/system/supplierquotation/supplierquotation.html
View File

@ -96,15 +96,15 @@
shiro:hasPermission="system:supplierquotation:export">
<i class="fa fa-download"></i> 导出
</a>
<a class="btn btn-info" onclick="quotationAudit()" shiro:hasPermission="sys:gysbj:shqr">
<a class="btn btn-info" onclick="quotationAudit()" shiro:hasPermission="system:supplierquotation:audit">
<i class="fa fa-file-text"></i> 审核
</a>
<a class="btn btn-success" onclick="quotationConfirm()"shiro:hasPermission="sys:gysbj:shqr">
<a class="btn btn-success" onclick="quotationConfirm()" shiro:hasPermission="system:supplierquotation:confirm">
<i class="fa fa-hand-grab-o"></i> 确认
</a>
<a class="btn btn-primary" onclick="quotationApprove()"shiro:hasPermission="sys:gysbj:hz">
<a class="btn btn-primary" onclick="quotationApprove()" shiro:hasPermission="system:supplierquotation:approved">
<i class="fa fa-hand-grab-o"></i> 核准
</a>

Write Preview
Loading…
Cancel
Save