From cb4bcbf08904d346d07b2024d40ecbeb3a745f2c Mon Sep 17 00:00:00 2001 From: zhangsiqi <2825463979@qq.com> Date: Fri, 7 Jun 2024 12:41:51 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=E5=B7=A5=E7=A8=8B=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=9A=E5=BC=80=E5=8F=91=E4=BF=AE=E6=94=B9=E5=8D=95=EF=BC=8C?= =?UTF-8?q?=E9=A2=86=E6=96=99=E9=A1=B5=E9=9D=A2=EF=BC=8C=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=A1=AE=E8=AE=A4=E9=A1=B5=E9=9D=A2=EF=BC=8C?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2=EF=BC=8C=E4=BF=AE=E8=AF=A5?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/erp/developModifyOrder/add.html | 112 +++++---- .../erp/developModifyOrder/detail.html | 231 ++++++++++-------- .../erp/developModifyOrder/edit.html | 217 ++++++++-------- .../erp/developModifyOrder/pickAdd.html | 152 +++++++++++- 4 files changed, 462 insertions(+), 250 deletions(-) diff --git a/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/add.html b/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/add.html index ce6a55c1..9e22e532 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/add.html +++ b/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/add.html @@ -3,6 +3,7 @@ + @@ -38,53 +39,52 @@ - -
-
-
- 选择开发修改单物料 - - 添加修改物料 - -
+ +
+
+
+ 选择开发修改单物料 + + 添加修改物料 +
-
-
-
-
+
+
+
+
-
-
-
- 选择采购物料 - - 添加修改物料 - -
+
+
+
+
+ 选择采购物料 + + 添加修改物料 +
-
-
-
-
+
+
+
+
-
-
-
- 选择通知人 - - 添加修改物料 - -
+
+
+
+
+ 选择通知人 + + 添加通知人 +
-
-
-
-
+
+
+
+
- +
@@ -129,7 +129,7 @@ }); var options = { id: "bootstrap-sub-table-developModify", - url: prefix + "/getDevelopModifyOrderList", + // url: prefix + "/getDevelopModifyOrderList", showSearch: false, showRefresh: false, showToggle: false, @@ -199,7 +199,11 @@ var option1 = { id: "bootstrap-sub-table-material", - url: prefix + "/list", + // url: prefix + "/list", + showSearch: false, + showRefresh: false, + showToggle: false, + showColumns: false, modalName: "bom", detailView: true, height: $(window).height() - 100, @@ -233,10 +237,34 @@ }; $.table.init(option1); + var option2 = { + id: "bootstrap-sub-table-biztoitem", + // url: prefix + "/list", + showSearch: false, + showRefresh: false, + showToggle: false, + showColumns: false, + modalName: "通知人", + detailView: true, + height: $(window).height() - 100, + //指定父id列 + columns: [ + {checkbox: false}, + {title: '通知人',field: 'item', }, + {title: '确认时间',field: 'materialNo', }, + {title: '操作',align: 'center', + formatter: function(value, row, index) { + var actions = []; + actions.push(' 删除 '); + return actions.join(''); + } + }] + }; + $.table.init(option2); }); initAllLevelTable = function(index, row, $detail) { $("#"+"all_level_table_"+row.id).bootstrapTable({ - url: prefix + "/allLevelList", + // url: prefix + "/allLevelList", method: 'post', sidePagination: "server", contentType: "application/x-www-form-urlencoded", @@ -378,7 +406,7 @@ initChildSonTable = function(index, row, $detail) { var childSonTable = $detail.html('
').find('table'); $(childSonTable).bootstrapTable({ - url: prefix + "/subList", + // url: prefix + "/subList", method: 'post', detailView: true, sidePagination: "server", diff --git a/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/detail.html b/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/detail.html index f318d310..df068b61 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/detail.html +++ b/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/detail.html @@ -2,130 +2,130 @@ + + +
- -
- -
- -
-
-