From 0141c171acd352f0bbeed84f05e9797590d19289 Mon Sep 17 00:00:00 2001
From: zhangsiqi <2825463979@qq.com>
Date: Mon, 22 Apr 2024 09:04:45 +0800
Subject: [PATCH] =?UTF-8?q?[update]=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?=
=?UTF-8?q?=EF=BC=8C=E4=B8=9A=E5=8A=A1=E5=91=98=E5=AD=97=E6=AE=B5=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9=E8=8E=B7=E5=8F=96=E4=B8=8B=E6=8B=89=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../templates/system/salesOrder/add.html | 8 +-
.../templates/system/salesOrder/detail.html | 1 +
.../templates/system/salesOrder/edit.html | 3 +-
.../system/salesOrder/salesOrder.html | 7 +-
.../system/salesOrder/taskModifyApply.html | 3 +-
.../system/salesOrder/taskYwjlVerify.html | 3 +-
.../system/salesOrder/taskYwzgVerify.html | 3 +-
.../system/salesOrder/taskZozjVerify.html | 3 +-
.../templates/system/supplier/detail.html | 292 ++++++++++++++++++
9 files changed, 311 insertions(+), 12 deletions(-)
create mode 100644 ruoyi-admin/src/main/resources/templates/system/supplier/detail.html
diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html
index f7b47fd2..07eec760 100644
--- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html
@@ -258,7 +258,8 @@
@@ -312,7 +313,7 @@
var auditStatusDatas = [[${@dict.getType('auditStatus')}]];
var sysUnitClassDatas = [[${@dict.getType('sys_unit_class')}]];
var processMethodDatas = [[${@dict.getType('processMethod')}]];
- var userName = [[${@permission.getPrincipalProperty('userName')}]];
+ var loginName = [[${@permission.getPrincipalProperty('loginName')}]];
var prefix = ctx + "system/salesOrder"
$(function() {
var options = {
@@ -514,10 +515,11 @@
url: ctx + 'system/salesOrder/getBinessMembers',
type: 'get',
success: function (res) {
+ console.log(res)
if (res.rows.length > 0) {
var usertData = res.rows;
for (let i in usertData) {
- $("#select[name='businessMembers']").append(
+ $("select[name='businessMembers']").append(
"");
}
} else {
diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/detail.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/detail.html
index 191218d5..c75b6a96 100644
--- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/detail.html
+++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/detail.html
@@ -327,6 +327,7 @@
var sysUnitClassDatas = [[${@dict.getType('sys_unit_class')}]];
var processMethodDatas = [[${@dict.getType('processMethod')}]];
var sysSalesOrder = [[${sysSalesOrder}]];
+ var loginName = [[${@permission.getPrincipalProperty('loginName')}]];
$("#form-salesOrder-edit").validate({focusCleanup: true});
$(function() {
var options = {
diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/edit.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/edit.html
index ee7c4908..68bf1537 100644
--- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/edit.html
@@ -522,10 +522,11 @@
url: ctx + 'system/salesOrder/getBinessMembers',
type: 'get',
success: function (res) {
+ console.log(res)
if (res.rows.length > 0) {
var usertData = res.rows;
for (let i in usertData) {
- $("#select[name='businessMembers']").append(
+ $("select[name='businessMembers']").append(
"");
}
} else {
diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html
index b080b7dd..523d9f93 100644
--- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html
+++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html
@@ -203,19 +203,18 @@
var deliveryStatusDatas = [[${@dict.getType('sys_delivery_status')}]];
var closeStatusDatas = [[${@dict.getType('sys_close_status')}]];
var confirmTaxDatas = [[${@dict.getType('sys_confirm_tax')}]];
- var userName = [[${@permission.getPrincipalProperty('userName')}]];
- var currentUser = [[${currentUser}]];
- var loginName = currentUser.loginName;
+ var loginName = [[${@permission.getPrincipalProperty('loginName')}]];
var prefix = ctx + "system/salesOrder";
$(function () {
$.ajax({
url: ctx + 'system/salesOrder/getBinessMembers',
type: 'get',
success: function (res) {
+ console.log(res)
if (res.rows.length > 0) {
var usertData = res.rows;
for (let i in usertData) {
- $("#select[name='businessMembers']").append(
+ $("select[name='businessMembers']").append(
"");
}
} else {
diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskModifyApply.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskModifyApply.html
index 3ef7a91b..a34fbce5 100644
--- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskModifyApply.html
+++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskModifyApply.html
@@ -577,10 +577,11 @@
url: ctx + 'system/salesOrder/getBinessMembers',
type: 'get',
success: function (res) {
+ console.log(res)
if (res.rows.length > 0) {
var usertData = res.rows;
for (let i in usertData) {
- $("#select[name='businessMembers']").append(
+ $("select[name='businessMembers']").append(
"");
}
} else {
diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwjlVerify.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwjlVerify.html
index 0365a56a..35910e50 100644
--- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwjlVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwjlVerify.html
@@ -553,10 +553,11 @@
url: ctx + 'system/salesOrder/getBinessMembers',
type: 'get',
success: function (res) {
+ console.log(res)
if (res.rows.length > 0) {
var usertData = res.rows;
for (let i in usertData) {
- $("#select[name='businessMembers']").append(
+ $("select[name='businessMembers']").append(
"");
}
} else {
diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwzgVerify.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwzgVerify.html
index 3d861975..03988543 100644
--- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwzgVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwzgVerify.html
@@ -516,10 +516,11 @@
url: ctx + 'system/salesOrder/getBinessMembers',
type: 'get',
success: function (res) {
+ console.log(res)
if (res.rows.length > 0) {
var usertData = res.rows;
for (let i in usertData) {
- $("#select[name='businessMembers']").append(
+ $("select[name='businessMembers']").append(
"");
}
} else {
diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskZozjVerify.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskZozjVerify.html
index 7c135730..68446481 100644
--- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskZozjVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskZozjVerify.html
@@ -562,10 +562,11 @@
url: ctx + 'system/salesOrder/getBinessMembers',
type: 'get',
success: function (res) {
+ console.log(res)
if (res.rows.length > 0) {
var usertData = res.rows;
for (let i in usertData) {
- $("#select[name='businessMembers']").append(
+ $("select[name='businessMembers']").append(
"");
}
} else {
diff --git a/ruoyi-admin/src/main/resources/templates/system/supplier/detail.html b/ruoyi-admin/src/main/resources/templates/system/supplier/detail.html
new file mode 100644
index 00000000..3285ef2e
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/system/supplier/detail.html
@@ -0,0 +1,292 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file