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 {