diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js index 832deddf..ae351482 100644 --- a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js +++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js @@ -140,7 +140,9 @@ var table = { fixedNumber: options.fixedNumber, // 列冻结的个数（左侧） fixedRightNumber: options.fixedRightNumber, // 列冻结的个数（右侧） onReorderRow: options.onReorderRow, // 当拖拽结束后处理函数 - queryParams: options.queryParams, // 传递参数（*） + queryParams:(params)=>{ + return options.queryParams(params,options.id) + }, // 传递参数（*） rowStyle: options.rowStyle, // 通过自定义函数设置行样式 footerStyle: options.footerStyle, // 通过自定义函数设置页脚样式 headerStyle: options.headerStyle, // 通过自定义函数设置标题样式 @@ -166,8 +168,8 @@ var table = { return optionsIds.substring(0, optionsIds.length - 1); }, // 查询条件 - queryParams: function (params) { - table.set(); + queryParams: function (params,id) { + table.set(id); var curParams = { // 传递参数查询参数 pageSize: params.limit, diff --git a/ruoyi-admin/src/main/resources/templates/inventory/delivery/add.html b/ruoyi-admin/src/main/resources/templates/inventory/delivery/add.html new file mode 100644 index 00000000..7bf20867 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/inventory/delivery/add.html @@ -0,0 +1,76 @@ + + + + + + + +
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+
+ + +
+
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/inventory/delivery/delivery.html b/ruoyi-admin/src/main/resources/templates/inventory/delivery/delivery.html new file mode 100644 index 00000000..89c59390 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/inventory/delivery/delivery.html @@ -0,0 +1,150 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • + +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/inventory/delivery/edit.html b/ruoyi-admin/src/main/resources/templates/inventory/delivery/edit.html new file mode 100644 index 00000000..d287b164 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/inventory/delivery/edit.html @@ -0,0 +1,77 @@ + + + + + + + +
+
+ +
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+
+ + +
+
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/inventory/delivery/view.html b/ruoyi-admin/src/main/resources/templates/inventory/delivery/view.html new file mode 100644 index 00000000..32461634 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/inventory/delivery/view.html @@ -0,0 +1,176 @@ + + + + + + + + +
+
+
+
发货单
+
要求发货时间:
+ +
+
+ +
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+
+ +
+
+
+
+
+
+ + + +
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/inventory/execution/edit.html b/ruoyi-admin/src/main/resources/templates/inventory/execution/edit.html index 19d688dc..ac3c769b 100644 --- a/ruoyi-admin/src/main/resources/templates/inventory/execution/edit.html +++ b/ruoyi-admin/src/main/resources/templates/inventory/execution/edit.html @@ -3,6 +3,7 @@ +
@@ -353,10 +359,11 @@
+
- +
@@ -364,7 +371,7 @@
- +
@@ -394,33 +401,53 @@
-
+
-
+
- + +
- +
+ +
- +
+ +
- - + +
+ +
- +
+ +
+
+ +
@@ -428,17 +455,35 @@ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/inventory/outer/edit.html b/ruoyi-admin/src/main/resources/templates/inventory/outer/edit.html new file mode 100644 index 00000000..36cc1cc5 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/inventory/outer/edit.html @@ -0,0 +1,652 @@ + + + + + + + + + +
+
+ 基础信息 +
+
+
要求发货时间:
+
+
+ +
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+ 产品清单 +
+
+
+
+
+ 已生成发货记录 +
+
+
+
+
+
+ + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/inventory/outer/outer.html b/ruoyi-admin/src/main/resources/templates/inventory/outer/outer.html new file mode 100644 index 00000000..ca20cc3c --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/inventory/outer/outer.html @@ -0,0 +1,157 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/vendor/add.html b/ruoyi-admin/src/main/resources/templates/system/vendor/add.html index 45309d33..da55b147 100644 --- a/ruoyi-admin/src/main/resources/templates/system/vendor/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/vendor/add.html @@ -3,6 +3,8 @@ + +
@@ -58,6 +60,18 @@
+
+
+ +
+ +
+
+
@@ -69,6 +83,8 @@
+ +