From 2b7bfdb69d5db7f3ade4fcadd8d0045ea03dce07 Mon Sep 17 00:00:00 2001 From: zhangsiqi <2825463979@qq.com> Date: Tue, 9 Jul 2024 21:10:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E8=B5=84=E6=96=99=E9=87=8D=E6=96=B0=E5=AE=A1=E6=A0=B8=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E9=87=8D=E6=96=B0=E7=94=B3=E8=AF=B7=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E5=8A=9F=E8=83=BD=EF=BC=8C=E8=8E=B7=E5=8F=96=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E7=BB=84=E7=94=A8=E6=88=B7,=E8=BF=9B=E5=85=A5?= =?UTF-8?q?=E9=87=8D=E6=96=B0=E5=AE=A1=E6=A0=B8=E8=8A=82=E7=82=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{ => controller}/CategoryController.java | 2 +- .../erp/developModifyOrder/confirm.html | 286 ++++++++++++++++++ .../system/customer/taskModifyApply.html | 116 ++++--- .../system/customer/taskYwjlVerify.html | 5 +- .../system/customer/taskYwzgVerify.html | 7 +- .../system/customer/taskZozjVerify.html | 7 +- 6 files changed, 345 insertions(+), 78 deletions(-) rename ruoyi-admin/src/main/java/com/ruoyi/system/{ => controller}/CategoryController.java (95%) create mode 100644 ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/confirm.html diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/CategoryController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/CategoryController.java similarity index 95% rename from ruoyi-admin/src/main/java/com/ruoyi/system/CategoryController.java rename to ruoyi-admin/src/main/java/com/ruoyi/system/controller/CategoryController.java index 948207e5..eb82334d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/CategoryController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/CategoryController.java @@ -1,4 +1,4 @@ -package com.ruoyi.system; +package com.ruoyi.system.controller; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.framework.web.service.CategoryService; diff --git a/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/confirm.html b/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/confirm.html new file mode 100644 index 00000000..8aa65a9d --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/confirm.html @@ -0,0 +1,286 @@ + + + + + + + + + +
+
+ + +
+
+
+
修改开发修改单:
+
+
+
+
+ +
+ +
+
+
+ +
+ + +
+
+
+
+
+
+
+
+ 选择开发修改单物料 + + 添加修改物料 + +
+
+
+
+
+
+
+
+
+
+
+ 选择采购物料 + + 添加修改物料 + +
+
+
+
+
+
+
+
+
+
+
+ 选择通知人 + + 添加通知人 + +
+
+
+
+
+
+
+
+
+ + + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/customer/taskModifyApply.html b/ruoyi-admin/src/main/resources/templates/system/customer/taskModifyApply.html index df8d5a41..39dbecf7 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customer/taskModifyApply.html +++ b/ruoyi-admin/src/main/resources/templates/system/customer/taskModifyApply.html @@ -38,101 +38,107 @@
- +
- +
- +
- +
- + + +
+
+
+ +
+
- +
- +
- +
- - + +
- +
- +
- +
- +
- +
- +
@@ -140,9 +146,8 @@
- +
@@ -152,9 +157,8 @@
- - + +
@@ -162,114 +166,100 @@
- - + + %
-
- +
- +
- +
- +
-
- +
@@ -289,7 +279,7 @@
- +

diff --git a/ruoyi-admin/src/main/resources/templates/system/customer/taskYwjlVerify.html b/ruoyi-admin/src/main/resources/templates/system/customer/taskYwjlVerify.html index 3c08b15c..23d64b10 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customer/taskYwjlVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/customer/taskYwjlVerify.html @@ -266,10 +266,7 @@
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/customer/taskYwzgVerify.html b/ruoyi-admin/src/main/resources/templates/system/customer/taskYwzgVerify.html index a6d5abed..b90be6f0 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customer/taskYwzgVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/customer/taskYwzgVerify.html @@ -266,10 +266,7 @@
- +
@@ -330,7 +327,7 @@ var usertData = res.rows; for (let i in usertData) { $("select[name='businessMembers']").append(""); + + usertData[i].loginName + "'>" + usertData[i].userName + ""); } $("select[name='businessMembers']").val(customer.businessMembers); } else { diff --git a/ruoyi-admin/src/main/resources/templates/system/customer/taskZozjVerify.html b/ruoyi-admin/src/main/resources/templates/system/customer/taskZozjVerify.html index 0eba7310..b656bf99 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customer/taskZozjVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/customer/taskZozjVerify.html @@ -265,10 +265,7 @@
- +
@@ -328,7 +325,7 @@ var usertData = res.rows; for (let i in usertData) { $("select[name='businessMembers']").append(""); + + usertData[i].loginName + "'>" + usertData[i].userName + ""); } $("select[name='businessMembers']").val(customer.businessMembers); } else {