zhaoy
/
BPA.SAAS.Web
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

优化商品工艺排序和工艺保存bug20241111-打包提交

kitchenmanage
gwbvipvip 2 days ago
parent
6f635fb76f
commit
6d4b06a6ab
66 changed files with 461 additions and 120 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +5
    -5
      config/proxy.js
  2. +7
    -1
      config/routes.js
  3. +0
    -16
      dist/9755.fc3e4184.async.js
  4. +13
    -0
      dist/9755.fd426fbb.async.js
  5. +6
    -5
      dist/asset-manifest.json
  6. +1
    -1
      dist/authorization/index.html
  7. +1
    -1
      dist/authorization/platformAuthorization/index.html
  8. +1
    -1
      dist/authorization/storeAuthorization/index.html
  9. +1
    -1
      dist/company/account/index.html
  10. +1
    -1
      dist/company/index.html
  11. +1
    -1
      dist/database/basic/batching/index.html
  12. +1
    -1
      dist/database/bom/index.html
  13. +1
    -1
      dist/database/goods/goodsInfo/index.html
  14. +1
    -1
      dist/database/goods/goodsattribute/index.html
  15. +1
    -1
      dist/database/goods/goodsattributeprice/index.html
  16. +1
    -1
      dist/database/goods/goodsbom/index.html
  17. +1
    -1
      dist/database/goods/goodsclassify/index.html
  18. +1
    -1
      dist/database/goods/goodstechnology/index.html
  19. +1
    -1
      dist/database/goods/goodstypemanage/index.html
  20. +1
    -1
      dist/database/goods/newgoods/index.html
  21. +1
    -1
      dist/database/index.html
  22. +1
    -1
      dist/device/deviceInfo/index.html
  23. +1
    -1
      dist/device/deviceVesion/index.html
  24. +1
    -1
      dist/device/index.html
  25. +1
    -1
      dist/device/product/index.html
  26. +1
    -1
      dist/device/productmanage/index.html
  27. +1
    -1
      dist/device/technology/index.html
  28. +1
    -1
      dist/device/warehousepostion/index.html
  29. +1
    -1
      dist/index.html
  30. +1
    -1
      dist/order/index.html
  31. +1
    -1
      dist/order/orderflow/index.html
  32. +1
    -1
      dist/order/thirdAuthorize/index.html
  33. +1
    -1
      dist/order/thirdOrder/index.html
  34. +1
    -1
      dist/org/index.html
  35. +1
    -1
      dist/org/orgamange/index.html
  36. +1
    -1
      dist/org/roles/index.html
  37. +1
    -1
      dist/org/users/index.html
  38. +0
    -1
      dist/p__database__goods__goodstechnology.1ea43b2e.async.js
  39. +1
    -0
      dist/p__database__goods__goodstechnology.7bbd924a.async.js
  40. +1
    -1
      dist/p__org__orgamange.7900ca70.async.js
  41. +0
    -1
      dist/p__scene__foodmenu.64a8437b.async.js
  42. +1
    -0
      dist/p__scene__foodmenu.91a960b5.async.js
  43. +1
    -0
      dist/p__sys__devicelog.29892851.async.js
  44. +1
    -1
      dist/push/batchingpush/index.html
  45. +1
    -1
      dist/push/bompush/index.html
  46. +1
    -1
      dist/push/goodspush/index.html
  47. +1
    -1
      dist/push/index.html
  48. +1
    -1
      dist/push/technologypush/index.html
  49. +1
    -1
      dist/scene/foodmenu/index.html
  50. +1
    -1
      dist/scene/index.html
  51. +1
    -1
      dist/scene/store/index.html
  52. +226
    -0
      dist/sys/devicelog/index.html
  53. +1
    -1
      dist/sys/dictionary/dicttype/index.html
  54. +1
    -1
      dist/sys/index.html
  55. +1
    -1
      dist/sys/menus/index.html
  56. +10
    -10
      dist/umi.3a4e71f1.js
  57. +1
    -1
      dist/user/index.html
  58. +1
    -1
      dist/user/login/index.html
  59. +1
    -1
      dist/welcome/index.html
  60. +1
    -0
      package.json
  61. +0
    -11
      src/pages/database/goods/goodstechnology/components/EditFrom.jsx
  62. +36
    -23
      src/pages/database/goods/goodstechnology/components/goodstechnologymaken.jsx
  63. +1
    -0
      src/pages/org/orgamange/index.jsx
  64. +91
    -0
      src/pages/sys/devicelog/index.jsx
  65. +10
    -0
      src/pages/sys/devicelog/service.js
  66. +5
    -0
      yarn.lock

+ 5
- 5
config/proxy.js View File

@@ -9,7 +9,7 @@
export default {
dev: {
'/saasbase/': {
target: 'http://localhost:5006/',
target: 'http://192.168.1.50:5006/',
changeOrigin: true,
secure: false, //关闭证书验证
pathRewrite: {
@@ -17,7 +17,7 @@
},
},
'/kitchbase/': {
target: 'http://localhost:5007/',
target: 'http://192.168.1.50:5007/',
changeOrigin: true,
secure: false, //关闭证书验证
pathRewrite: {
@@ -25,7 +25,7 @@
},
},
'/kitchorder/': {
target: 'http://localhost:5005/',
target: 'http://192.168.1.50:5005/',
changeOrigin: true,
secure: false, //关闭证书验证
pathRewrite: {
@@ -44,7 +44,7 @@
},
test: {
'/api/': {
target: 'http://localhost:5006',
target: 'http://192.168.1.50:5006',
changeOrigin: true,
secure: false,
pathRewrite: {
@@ -54,7 +54,7 @@
},
pre: {
'/api/': {
target: 'http://localhost:5006',
target: 'http://192.168.1.50:5006',
changeOrigin: true,
secure: false,
pathRewrite: {


+ 7
- 1
config/routes.js View File

@@ -61,7 +61,13 @@ export default [
// component: './sys/log',
// access: 'k3',
// },
{
name: '设备日志',
icon: 'smile',
path: '/sys/devicelog',
component: './sys/devicelog',
access: 'k3',
},
],
},
{


+ 0
- 16
dist/9755.fc3e4184.async.js
File diff suppressed because it is too large
View File


+ 13
- 0
dist/9755.fd426fbb.async.js
File diff suppressed because it is too large
View File


+ 6
- 5
dist/asset-manifest.json View File

@@ -1,6 +1,6 @@
{
"/umi.css": "/umi.2d7db433.css",
"/umi.js": "/umi.80142491.js",
"/umi.js": "/umi.3a4e71f1.js",
"/t__plugin-layout__Layout.css": "/t__plugin-layout__Layout.e1129705.chunk.css",
"/t__plugin-layout__Layout.js": "/t__plugin-layout__Layout.87f875be.async.js",
"/p__user__login.css": "/p__user__login.2f84d6a8.chunk.css",
@@ -8,10 +8,11 @@
"/p__sys__menus.js": "/p__sys__menus.7e3768f1.async.js",
"/p__sys__dictionary__dicttype.css": "/p__sys__dictionary__dicttype.f6838307.chunk.css",
"/p__sys__dictionary__dicttype.js": "/p__sys__dictionary__dicttype.2c47d0a5.async.js",
"/p__sys__devicelog.js": "/p__sys__devicelog.29892851.async.js",
"/p__company__account.css": "/p__company__account.f6838307.chunk.css",
"/p__company__account.js": "/p__company__account.c8dde3b9.async.js",
"/p__org__orgamange.css": "/p__org__orgamange.5d1001bb.chunk.css",
"/p__org__orgamange.js": "/p__org__orgamange.52eb80a0.async.js",
"/p__org__orgamange.js": "/p__org__orgamange.7900ca70.async.js",
"/p__org__roles.js": "/p__org__roles.5e82b905.async.js",
"/p__org__users.js": "/p__org__users.92f5141d.async.js",
"/p__database__basic__batching.css": "/p__database__basic__batching.5b012b67.chunk.css",
@@ -27,7 +28,7 @@
"/p__database__goods__goodsInfo.js": "/p__database__goods__goodsInfo.c1755db7.async.js",
"/p__database__goods__goodsbom.js": "/p__database__goods__goodsbom.bf9c6572.async.js",
"/p__database__goods__goodstechnology.css": "/p__database__goods__goodstechnology.bee21a79.chunk.css",
"/p__database__goods__goodstechnology.js": "/p__database__goods__goodstechnology.1ea43b2e.async.js",
"/p__database__goods__goodstechnology.js": "/p__database__goods__goodstechnology.7bbd924a.async.js",
"/p__database__goods__goodsattributeprice.css": "/p__database__goods__goodsattributeprice.fffb33ff.chunk.css",
"/p__database__goods__goodsattributeprice.js": "/p__database__goods__goodsattributeprice.ce19df4d.async.js",
"/p__device__product.js": "/p__device__product.5091f037.async.js",
@@ -40,7 +41,7 @@
"/p__device__technology.css": "/p__device__technology.63cc2960.chunk.css",
"/p__device__technology.js": "/p__device__technology.8f34f98a.async.js",
"/p__scene__store.js": "/p__scene__store.d0a67ce1.async.js",
"/p__scene__foodmenu.js": "/p__scene__foodmenu.64a8437b.async.js",
"/p__scene__foodmenu.js": "/p__scene__foodmenu.91a960b5.async.js",
"/p__push__goodspush.js": "/p__push__goodspush.5f417d94.async.js",
"/p__push__batchingpush.js": "/p__push__batchingpush.03878df7.async.js",
"/p__push__bompush.js": "/p__push__bompush.1840c32b.async.js",
@@ -75,7 +76,7 @@
"/9669.75110ec8.async.js": "/9669.75110ec8.async.js",
"/8565.a1cf0c0e.chunk.css": "/8565.a1cf0c0e.chunk.css",
"/6486.837492aa.async.js": "/6486.837492aa.async.js",
"/9755.fc3e4184.async.js": "/9755.fc3e4184.async.js",
"/9755.fd426fbb.async.js": "/9755.fd426fbb.async.js",
"/8691.53033a17.async.js": "/8691.53033a17.async.js",
"/2780.b239a3f2.chunk.css": "/2780.b239a3f2.chunk.css",
"/321.b1601fcd.chunk.css": "/321.b1601fcd.chunk.css",


+ 1
- 1
dist/authorization/index.html View File

@@ -221,6 +221,6 @@
</div>
</div>

<script src="/umi.80142491.js"></script>
<script src="/umi.3a4e71f1.js"></script>
</body>
</html>

+ 1
- 1
dist/authorization/platformAuthorization/index.html View File

@@ -221,6 +221,6 @@
</div>
</div>

<script src="/umi.80142491.js"></script>
<script src="/umi.3a4e71f1.js"></script>
</body>
</html>

+ 1
- 1
dist/authorization/storeAuthorization/index.html View File

@@ -221,6 +221,6 @@
</div>
</div>

<script src="/umi.80142491.js"></script>
<script src="/umi.3a4e71f1.js"></script>
</body>
</html>

+ 1
- 1
dist/company/account/index.html View File

@@ -221,6 +221,6 @@
</div>
</div>

<script src="/umi.80142491.js"></script>
<script src="/umi.3a4e71f1.js"></script>
</body>
</html>

+ 1
- 1
dist/company/index.html View File

@@ -221,6 +221,6 @@
</div>
</div>

<script src="/umi.80142491.js"></script>
<script src="/umi.3a4e71f1.js"></script>
</body>
</html>

+ 1
- 1
dist/database/basic/batching/index.html View File

@@ -221,6 +221,6 @@
</div>
</div>

<script src="/umi.80142491.js"></script>
<script src="/umi.3a4e71f1.js"></script>
</body>
</html>

+ 1
- 1
dist/database/bom/index.html View File

@@ -221,6 +221,6 @@
</div>
</div>

<script src="/umi.80142491.js"></script>
<script src="/umi.3a4e71f1.js"></script>
</body>
</html>

+ 1
- 1
dist/database/goods/goodsInfo/index.html View File

@@ -221,6 +221,6 @@
</div>
</div>

<script src="/umi.80142491.js"></script>
<script src="/umi.3a4e71f1.js"></script>
</body>
</html>

+ 1
- 1
dist/database/goods/goodsattribute/index.html View File

@@ -221,6 +221,6 @@
</div>
</div>

<script src="/umi.80142491.js"></script>
<script src="/umi.3a4e71f1.js"></script>
</body>
</html>

+ 1
- 1
dist/database/goods/goodsattributeprice/index.html View File

@@ -221,6 +221,6 @@
</div>
</div>

<script src="/umi.80142491.js"></script>
<script src="/umi.3a4e71f1.js"></script>
</body>
</html>

+ 1
- 1
dist/database/goods/goodsbom/index.html View File

@@ -221,6 +221,6 @@
</div>
</div>

<script src="/umi.80142491.js"></script>
<script src="/umi.3a4e71f1.js"></script>
</body>
</html>

+ 1
- 1
dist/database/goods/goodsclassify/index.html View File

@@ -221,6 +221,6 @@
</div>
</div>

<script src="/umi.80142491.js"></script>
<script src="/umi.3a4e71f1.js"></script>
</body>
</html>

+ 1
- 1
dist/database/goods/goodstechnology/index.html View File

@@ -221,6 +221,6 @@
</div>
</div>

<script src="/umi.80142491.js"></script>
<script src="/umi.3a4e71f1.js"></script>
</body>
</html>

+ 1
- 1
dist/database/goods/goodstypemanage/index.html View File

@@ -221,6 +221,6 @@
</div>
</div>

<script src="/umi.80142491.js"></script>
<script src="/umi.3a4e71f1.js"></script>
</body>
</html>

+ 1
- 1
dist/database/goods/newgoods/index.html View File

@@ -221,6 +221,6 @@
</div>
</div>

<script src="/umi.80142491.js"></script>
<script src="/umi.3a4e71f1.js"></script>
</body>
</html>

+ 1
- 1
dist/database/index.html View File

@@ -221,6 +221,6 @@
</div>
</div>

<script src="/umi.80142491.js"></script>
<script src="/umi.3a4e71f1.js"></script>
</body>
</html>

+ 1
- 1
dist/device/deviceInfo/index.html View File

@@ -221,6 +221,6 @@
</div>
</div>

<script src="/umi.80142491.js"></script>
<script src="/umi.3a4e71f1.js"></script>
</body>
</html>

+ 1
- 1
dist/device/deviceVesion/index.html View File

@@ -221,6 +221,6 @@
</div>
</div>

<script src="/umi.80142491.js"></script>
<script src="/umi.3a4e71f1.js"></script>
</body>
</html>

+ 1
- 1
dist/device/index.html View File

@@ -221,6 +221,6 @@
</div>
</div>

<script src="/umi.80142491.js"></script>
<script src="/umi.3a4e71f1.js"></script>
</body>
</html>

+ 1
- 1
dist/device/product/index.html View File

@@ -221,6 +221,6 @@
</div>
</div>

<script src="/umi.80142491.js"></script>
<script src="/umi.3a4e71f1.js"></script>
</body>
</html>

+ 1
- 1
dist/device/productmanage/index.html View File

@@ -221,6 +221,6 @@
</div>
</div>

<script src="/umi.80142491.js"></script>
<script src="/umi.3a4e71f1.js"></script>
</body>
</html>

+ 1
- 1
dist/device/technology/index.html View File

@@ -221,6 +221,6 @@
</div>
</div>

<script src="/umi.80142491.js"></script>
<script src="/umi.3a4e71f1.js"></script>
</body>
</html>

+ 1
- 1
dist/device/warehousepostion/index.html View File

@@ -221,6 +221,6 @@
</div>
</div>

<script src="/umi.80142491.js"></script>
<script src="/umi.3a4e71f1.js"></script>
</body>
</html>

+ 1
- 1
dist/index.html View File

@@ -221,6 +221,6 @@
</div>
</div>

<script src="/umi.80142491.js"></script>
<script src="/umi.3a4e71f1.js"></script>
</body>
</html>

+ 1
- 1
dist/order/index.html View File

@@ -221,6 +221,6 @@
</div>
</div>

<script src="/umi.80142491.js"></script>
<script src="/umi.3a4e71f1.js"></script>
</body>
</html>

+ 1
- 1
dist/order/orderflow/index.html View File

@@ -221,6 +221,6 @@
</div>
</div>

<script src="/umi.80142491.js"></script>
<script src="/umi.3a4e71f1.js"></script>
</body>
</html>

+ 1
- 1
dist/order/thirdAuthorize/index.html View File

@@ -221,6 +221,6 @@
</div>
</div>

<script src="/umi.80142491.js"></script>
<script src="/umi.3a4e71f1.js"></script>
</body>
</html>

+ 1
- 1
dist/order/thirdOrder/index.html View File

@@ -221,6 +221,6 @@
</div>
</div>

<script src="/umi.80142491.js"></script>
<script src="/umi.3a4e71f1.js"></script>
</body>
</html>

+ 1
- 1
dist/org/index.html View File

@@ -221,6 +221,6 @@
</div>
</div>

<script src="/umi.80142491.js"></script>
<script src="/umi.3a4e71f1.js"></script>
</body>
</html>

+ 1
- 1
dist/org/orgamange/index.html View File

@@ -221,6 +221,6 @@
</div>
</div>

<script src="/umi.80142491.js"></script>
<script src="/umi.3a4e71f1.js"></script>
</body>
</html>

+ 1
- 1
dist/org/roles/index.html View File

@@ -221,6 +221,6 @@
</div>
</div>

<script src="/umi.80142491.js"></script>
<script src="/umi.3a4e71f1.js"></script>
</body>
</html>

+ 1
- 1
dist/org/users/index.html View File

@@ -221,6 +221,6 @@
</div>
</div>

<script src="/umi.80142491.js"></script>
<script src="/umi.3a4e71f1.js"></script>
</body>
</html>

+ 0
- 1
dist/p__database__goods__goodstechnology.1ea43b2e.async.js
File diff suppressed because it is too large
View File


+ 1
- 0
dist/p__database__goods__goodstechnology.7bbd924a.async.js
File diff suppressed because it is too large
View File


dist/p__org__orgamange.7900ca70.async.js
File diff suppressed because it is too large
View File


+ 0
- 1
dist/p__scene__foodmenu.64a8437b.async.js
File diff suppressed because it is too large
View File


+ 1
- 0
dist/p__scene__foodmenu.91a960b5.async.js
File diff suppressed because it is too large
View File


+ 1
- 0
dist/p__sys__devicelog.29892851.async.js View File

@@ -0,0 +1 @@
(self.webpackChunkant_design_pro=self.webpackChunkant_design_pro||[]).push([[991],{70976:function(A,o,e){"use strict";e.r(o),e.d(o,{default:function(){return I}});var c=e(39428),g=e(3182),v=e(28790),h=e(16894),m=e(48971),x=e(96690),P={getDeviceLogPage:function(d){return(0,m.WY)((0,x.w)()+"/api/device/getDeviceLogPage",{method:"Post",data:d})}},p=e(30381),s=e.n(p),a=e(85893),y=function(){var d=[{title:"\u4E3B\u952E",dataIndex:"id",tip:"key",hideInSearch:!0,hideInTable:!0},{title:"\u6587\u4EF6\u540D\u79F0",dataIndex:"fileName",ellipsis:!0},{title:"\u52A0\u76DF\u5546\u540D\u79F0",dataIndex:"companyName",hideInSearch:!0,ellipsis:!0},{title:"\u521B\u5EFA\u65F6\u95F4",dataIndex:"createAt",valueType:"dateTimeRange",render:function(r,t){return(0,a.jsx)("span",{children:t.createAt})}},{title:"\u64CD\u4F5C",dataIndex:"option",valueType:"option",fixed:"right",width:350,render:function(r,t){return[(0,a.jsx)("a",{href:t.fileUrl,download:!0,children:"\u4E0B\u8F7D"},"config")]}}];return(0,a.jsx)(v.ZP,{header:{title:"",breadcrumb:{}},children:(0,a.jsx)(h.ZP,{headerTitle:"\u65E5\u5FD7\u5217\u8868",rowKey:"id",pagination:{defaultPageSize:10},search:{labelWidth:"auto",span:"1",collapseRender:!1,defaultParams:{createAt:[s()().startOf("month"),s()().endOf("month")]}},request:function(){var i=(0,g.Z)((0,c.Z)().mark(function r(t){var l,u;return(0,c.Z)().wrap(function(n){for(;;)switch(n.prev=n.next){case 0:return l=[],u=0,t.startTime=t.createAt!=null?t.createAt[0]:null,t.endTime=t.createAt!=null?t.createAt[1]:null,n.next=6,P.getDeviceLogPage(t).then(function(f){l=f.data.data,u=f.data.total});case 6:return n.abrupt("return",{data:l,total:u});case 7:case"end":return n.stop()}},r)}));return function(r){return i.apply(this,arguments)}}(),columns:d})})},I=y}}]);

+ 1
- 1
dist/push/batchingpush/index.html View File

@@ -221,6 +221,6 @@
</div>
</div>

<script src="/umi.80142491.js"></script>
<script src="/umi.3a4e71f1.js"></script>
</body>
</html>

+ 1
- 1
dist/push/bompush/index.html View File

@@ -221,6 +221,6 @@
</div>
</div>

<script src="/umi.80142491.js"></script>
<script src="/umi.3a4e71f1.js"></script>
</body>
</html>

+ 1
- 1
dist/push/goodspush/index.html View File

@@ -221,6 +221,6 @@
</div>
</div>

<script src="/umi.80142491.js"></script>
<script src="/umi.3a4e71f1.js"></script>
</body>
</html>

+ 1
- 1
dist/push/index.html View File

@@ -221,6 +221,6 @@
</div>
</div>

<script src="/umi.80142491.js"></script>
<script src="/umi.3a4e71f1.js"></script>
</body>
</html>

+ 1
- 1
dist/push/technologypush/index.html View File

@@ -221,6 +221,6 @@
</div>
</div>

<script src="/umi.80142491.js"></script>
<script src="/umi.3a4e71f1.js"></script>
</body>
</html>

+ 1
- 1
dist/scene/foodmenu/index.html View File

@@ -221,6 +221,6 @@
</div>
</div>

<script src="/umi.80142491.js"></script>
<script src="/umi.3a4e71f1.js"></script>
</body>
</html>

+ 1
- 1
dist/scene/index.html View File

@@ -221,6 +221,6 @@
</div>
</div>

<script src="/umi.80142491.js"></script>
<script src="/umi.3a4e71f1.js"></script>
</body>
</html>

+ 1
- 1
dist/scene/store/index.html View File

@@ -221,6 +221,6 @@
</div>
</div>

<script src="/umi.80142491.js"></script>
<script src="/umi.3a4e71f1.js"></script>
</body>
</html>

+ 226
- 0
dist/sys/devicelog/index.html View File

@@ -0,0 +1,226 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta
name="keywords"
content="antd,umi,umijs,ant design,Scaffolding, layout, Ant Design, project, Pro, admin, console, homepage, out-of-the-box, middle and back office, solution, component library"
/>
<meta
name="description"
content="
An out-of-box UI solution for enterprise applications as a React boilerplate."
/>
<meta
name="description"
content="
Out-of-the-box mid-stage front-end/design solution."
/>
<meta
name="viewport"
content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
/>
<title>Ant Design Pro</title>
<link rel="icon" href="/favicon.ico" type="image/x-icon" />
<!-- <script src="//api.map.baidu.com/api?type=webgl&v=1.0&ak=Rvf71uBzNi7rWo1bhCvzbmLTFbPihNur"></script> -->
<link rel="stylesheet" href="/umi.2d7db433.css" />
<script>
window.routerBase = "/";
</script>
<script>
//! umi version: 3.5.39
</script>
</head>
<body>
<noscript>Out-of-the-box mid-stage front/design solution!</noscript>
<div id="root">
<style>
html,
body,
#root {
height: 100%;
margin: 0;
padding: 0;
}
#root {
background-repeat: no-repeat;
background-size: 100% auto;
}
.page-loading-warp {
display: flex;
align-items: center;
justify-content: center;
padding: 98px;
}
.ant-spin {
position: absolute;
display: none;
-webkit-box-sizing: border-box;
box-sizing: border-box;
margin: 0;
padding: 0;
color: rgba(0, 0, 0, 0.65);
color: #1890ff;
font-size: 14px;
font-variant: tabular-nums;
line-height: 1.5;
text-align: center;
list-style: none;
opacity: 0;
-webkit-transition: -webkit-transform 0.3s
cubic-bezier(0.78, 0.14, 0.15, 0.86);
transition: -webkit-transform 0.3s
cubic-bezier(0.78, 0.14, 0.15, 0.86);
transition: transform 0.3s cubic-bezier(0.78, 0.14, 0.15, 0.86);
transition: transform 0.3s cubic-bezier(0.78, 0.14, 0.15, 0.86),
-webkit-transform 0.3s cubic-bezier(0.78, 0.14, 0.15, 0.86);
-webkit-font-feature-settings: "tnum";
font-feature-settings: "tnum";
}

.ant-spin-spinning {
position: static;
display: inline-block;
opacity: 1;
}

.ant-spin-dot {
position: relative;
display: inline-block;
width: 20px;
height: 20px;
font-size: 20px;
}

.ant-spin-dot-item {
position: absolute;
display: block;
width: 9px;
height: 9px;
background-color: #1890ff;
border-radius: 100%;
-webkit-transform: scale(0.75);
-ms-transform: scale(0.75);
transform: scale(0.75);
-webkit-transform-origin: 50% 50%;
-ms-transform-origin: 50% 50%;
transform-origin: 50% 50%;
opacity: 0.3;
-webkit-animation: antspinmove 1s infinite linear alternate;
animation: antSpinMove 1s infinite linear alternate;
}

.ant-spin-dot-item:nth-child(1) {
top: 0;
left: 0;
}

.ant-spin-dot-item:nth-child(2) {
top: 0;
right: 0;
-webkit-animation-delay: 0.4s;
animation-delay: 0.4s;
}

.ant-spin-dot-item:nth-child(3) {
right: 0;
bottom: 0;
-webkit-animation-delay: 0.8s;
animation-delay: 0.8s;
}

.ant-spin-dot-item:nth-child(4) {
bottom: 0;
left: 0;
-webkit-animation-delay: 1.2s;
animation-delay: 1.2s;
}

.ant-spin-dot-spin {
-webkit-transform: rotate(45deg);
-ms-transform: rotate(45deg);
transform: rotate(45deg);
-webkit-animation: antrotate 1.2s infinite linear;
animation: antRotate 1.2s infinite linear;
}

.ant-spin-lg .ant-spin-dot {
width: 32px;
height: 32px;
font-size: 32px;
}

.ant-spin-lg .ant-spin-dot i {
width: 14px;
height: 14px;
}

@media all and (-ms-high-contrast: none), (-ms-high-contrast: active) {
.ant-spin-blur {
background: #fff;
opacity: 0.5;
}
}

@-webkit-keyframes antSpinMove {
to {
opacity: 1;
}
}

@keyframes antSpinMove {
to {
opacity: 1;
}
}

@-webkit-keyframes antRotate {
to {
-webkit-transform: rotate(405deg);
transform: rotate(405deg);
}
}

@keyframes antRotate {
to {
-webkit-transform: rotate(405deg);
transform: rotate(405deg);
}
}
</style>
<div
style="
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
height: 100%;
min-height: 420px;
"
>
<img src="/pro_icon.svg" alt="logo" width="256" />
<div class="page-loading-warp">
<div class="ant-spin ant-spin-lg ant-spin-spinning">
<span class="ant-spin-dot ant-spin-dot-spin"
><i class="ant-spin-dot-item"></i><i class="ant-spin-dot-item"></i
><i class="ant-spin-dot-item"></i><i class="ant-spin-dot-item"></i
></span>
</div>
</div>
<div
style="display: flex; align-items: center; justify-content: center"
>
<img
src="https://gw.alipayobjects.com/zos/rmsportal/KDpgvguMpGfqaHPjicRK.svg"
width="32"
style="margin-right: 8px"
/>
Ant Design
</div>
</div>
</div>

<script src="/umi.3a4e71f1.js"></script>
</body>
</html>

+ 1
- 1
dist/sys/dictionary/dicttype/index.html View File

@@ -221,6 +221,6 @@
</div>
</div>

<script src="/umi.80142491.js"></script>
<script src="/umi.3a4e71f1.js"></script>
</body>
</html>

+ 1
- 1
dist/sys/index.html View File

@@ -221,6 +221,6 @@
</div>
</div>

<script src="/umi.80142491.js"></script>
<script src="/umi.3a4e71f1.js"></script>
</body>
</html>

+ 1
- 1
dist/sys/menus/index.html View File

@@ -221,6 +221,6 @@
</div>
</div>

<script src="/umi.80142491.js"></script>
<script src="/umi.3a4e71f1.js"></script>
</body>
</html>

dist/umi.3a4e71f1.js
File diff suppressed because it is too large
View File


+ 1
- 1
dist/user/index.html View File

@@ -221,6 +221,6 @@
</div>
</div>

<script src="/umi.80142491.js"></script>
<script src="/umi.3a4e71f1.js"></script>
</body>
</html>

+ 1
- 1
dist/user/login/index.html View File

@@ -221,6 +221,6 @@
</div>
</div>

<script src="/umi.80142491.js"></script>
<script src="/umi.3a4e71f1.js"></script>
</body>
</html>

+ 1
- 1
dist/welcome/index.html View File

@@ -221,6 +221,6 @@
</div>
</div>

<script src="/umi.80142491.js"></script>
<script src="/umi.3a4e71f1.js"></script>
</body>
</html>

+ 1
- 0
package.json View File

@@ -66,6 +66,7 @@
"classnames": "^2.2.6",
"cos-js-sdk-v5": "^1.3.5",
"echarts": "^5.3.3",
"jquery": "^3.7.1",
"js-base64": "^3.7.5",
"js-export-excel": "^1.1.4",
"linq": "^4.0.0",


+ 0
- 11
src/pages/database/goods/goodstechnology/components/EditFrom.jsx View File

@@ -6,11 +6,8 @@ import From from '../components/From'

const EditFrom = (props) => {
const [fromdata, setfromdata] = useState([])
//const [disabled, setdisabled] = useState(false)
const [sort, setsort] = useState(1)
useEffect(() => {
//setfromdata(props.fromdata)
//props.fromdata=fromdata
if(props.fromdata.length==0){
setfromdata([])
}else{
@@ -30,7 +27,6 @@ const EditFrom = (props) => {
}
else {
let so = sort;
console.log("fromdata", fromdata)
setsort(sort + 1)
let data = [...fromdata]
let index = fromdata.length
@@ -40,7 +36,6 @@ const EditFrom = (props) => {
var max = fromdata.reduce(function (prev, current) {
return (prev.sort > current.sort) ? prev : current;
});
console.log("最大序号：", max.sort)
so = max.sort + 1;
}
data.push({ index: index + 1, id: '', stepName: '', chnologyId: '', actionJson: '', sort: so, goodsId: '', goodsAttributeId: '', optiondata: [], propsdata: [], isBatch: true, typeName: '', disabled: false })
@@ -51,14 +46,11 @@ const EditFrom = (props) => {
}
//删除工艺
const onDelClick = (val) => {
console.log(val)
console.log(fromdata)
let data = fromdata.filter(x => x.sort != val)
data.forEach((x,index)=>{
x.sort=index+1;
})
setfromdata(data);
console.log(data)
if(data.length==0){
setsort(1)
}else{
@@ -71,8 +63,6 @@ const EditFrom = (props) => {
}
//选择工艺步骤事件
const onHandleChange = (value, option, index) => {
console.log(fromdata)
console.log(index)
var sd = props.technologyattralldata.filter(x => x.technologyId == value);
var newdata = fromdata.map(x => {
if (x.index == index) {
@@ -99,7 +89,6 @@ const EditFrom = (props) => {
})
setfromdata(newdata)
props.ontechnologyChange(newdata)
console.log("from", newdata)
}
//保存
const onSaveClick=(fromdata)=>{


+ 36
- 23
src/pages/database/goods/goodstechnology/components/goodstechnologymaken.jsx View File

@@ -255,7 +255,21 @@ const goodstechnologymaken = (props) => {
obj.propsdata = propsdatanew;
obj.technologyType = item.technologyType;
obj.typeName = item.stepName;

let optiondatanew = [];
obj.propsdata.forEach(option => {
const exists = obj.optiondata.some(od => od.technologyactionId === option.id);
if (!exists) {
const maxIndex = obj.optiondata.reduce((max, t) => Math.max(max, t.index || 0), 0);
optiondatanew.push({
actionName: option.actionName,
actionValue: '',
index: maxIndex + 1,
technologyactionId: option.id
});
}
});
obj.optiondata.push(...optiondatanew);
attr.push(obj)
})
setfromdata(attr)
@@ -392,28 +406,27 @@ const goodstechnologymaken = (props) => {
} else {
item.actionJson = JSON.stringify(x.optiondata);
}
x.optiondata.forEach(f => {
var df = x.propsdata.find(x => x.id == f.technologyactionId)
if (df) {
if (df.actionType == "select" && f.actionValue == '') {
check = false;
}
if (df.actionType == "digit" && (f.actionValue === '' || f.actionValue === null)) {
check = false;
}
if (df.actionType == "text" && (f.actionValue === '' || f.actionValue === null)) {
check = false;
}
if (df.actionType == "textarea" && (f.actionValue === '' || f.actionValue === null)) {
check = false;
}
} else {
if (f.actionValue === '') {
check = false;
}
}

})
// x.optiondata.forEach(f => {
// var df = x.propsdata.find(x => x.id == f.technologyactionId)
// if (df) {
// if (df.actionType == "select" && f.actionValue == '') {
// check = false;
// }
// if (df.actionType == "digit" && (f.actionValue === '' || f.actionValue === null)) {
// check = false;
// }
// if (df.actionType == "text" && (f.actionValue === '' || f.actionValue === null)) {
// check = false;
// }
// if (df.actionType == "textarea" && (f.actionValue === '' || f.actionValue === null)) {
// check = false;
// }
// } else {
// if (f.actionValue === '') {
// check = false;
// }
// }
// })
item.goodsId = props.goodsid
item.warehousrTemplateId = WarehousrTemplateId;
item.goodsAttributeId = checkvalue.join(',')


+ 1
- 0
src/pages/org/orgamange/index.jsx View File

@@ -340,6 +340,7 @@ const TableList = () => {
success = await handleAdd(value);
}
if (success) {
initfranchiseeType()
handleModalVisible(false);
if (actionRef.current) {
actionRef.current.reload();


+ 91
- 0
src/pages/sys/devicelog/index.jsx View File

@@ -0,0 +1,91 @@
import { PageContainer } from "@ant-design/pro-layout";
import ProTable from "@ant-design/pro-table";
import api from './service';
import moment from 'moment';

const devicelog = () => {

const columns = [
{
title: '主键',
dataIndex: 'id',
tip: 'key',
hideInSearch: true,
hideInTable: true
},
{
title: '文件名称',
dataIndex: 'fileName',
ellipsis: true,
},
{
title: '加盟商名称',
dataIndex: 'companyName',
hideInSearch: true,
ellipsis: true,
},
{
title: '创建时间',
dataIndex: 'createAt',
valueType: 'dateTimeRange',
render: (_, record) => {
return <span>{record.createAt}</span>;
}
},
{
title: '操作',
dataIndex: 'option',
valueType: 'option',
fixed: 'right',
width: 350,
render: (_, record) => [
<a
key="config"
href={record.fileUrl}
download
>
下载
</a>
]
}
]
return (
<PageContainer
header={{
title: '',
breadcrumb: {},
}}
>
<ProTable
headerTitle="日志列表"
rowKey="id"
pagination={{ defaultPageSize: 10 }}
search={{
labelWidth: 'auto',
span: '1',
collapseRender: false,
defaultParams: {
createAt: [moment().startOf('month'), moment().endOf('month')],
},
}}
request={async (params) => {
let logData = [];
var total = 0;
params.startTime = params.createAt != undefined ? params.createAt[0] : null;
params.endTime = params.createAt != undefined ? params.createAt[1] : null;
await api.getDeviceLogPage(params).then((r) => {
logData = r.data.data;
total = r.data.total;
});
return {
data: logData,
total: total
};
}}
columns={columns}
/>
</PageContainer>
)
}

export default devicelog;

+ 10
- 0
src/pages/sys/devicelog/service.js View File

@@ -0,0 +1,10 @@
import { request } from 'umi';
import { getDataBaseUrl } from '@/global_data';
export default {
getDeviceLogPage(params) {
return request(getDataBaseUrl() + '/api/device/getDeviceLogPage', {
method: 'Post',
data: params,
});
},
}

+ 5
- 0
yarn.lock View File

@@ -12227,6 +12227,11 @@ jquery@^3.5.1:
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.4.tgz#ba065c188142100be4833699852bf7c24dc0252f"
integrity sha512-v28EW9DWDFpzcD9O5iyJXg3R3+q+mET5JhnjJzQUZMHOv67bpSIHq81GEYpPNZHG+XXHsfSme3nxp/hndKEcsQ==

jquery@^3.7.1:
version "3.7.1"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.7.1.tgz#083ef98927c9a6a74d05a6af02806566d16274de"
integrity sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==

js-base64@^3.7.5:
version "3.7.5"
resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-3.7.5.tgz#21e24cf6b886f76d6f5f165bfcd69cc55b9e3fca"


Write Preview
Loading…
Cancel
Save