From 3118f76b8168019c91106d4d38d2ce1a2a74c494 Mon Sep 17 00:00:00 2001
From: xinyb <574600396@qq.com>
Date: 星期五, 13 九月 2024 15:55:47 +0800
Subject: [PATCH] 调整审计功能加密功能

---
 WebRoot/js/panel.js |   25 ++++++++++++++++---------
 1 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/WebRoot/js/panel.js b/WebRoot/js/panel.js
index 58e207d..aea7ed7 100644
--- a/WebRoot/js/panel.js
+++ b/WebRoot/js/panel.js
@@ -3390,10 +3390,25 @@
 							array.push((plane[auditField[a][0]] != null ? plane[auditField[a][0]] : ''));
 						}
 					}
+					auditJson.auditIndex = news + ',' + old + ',' + array.join(',');
+					let auditType="update";
+					if (isNew == 1 && doc == "") {
+						auditType = 'add';
+					}
+					if (typeof (type) != 'undefined' && type == '2add') {
+						auditType = "add";
+					}
+					auditJson.auditType = auditType;
+					auditJson.usercode = '';
+					auditJson.username = '';
 					auditJson.fieldId = name;
 					auditJson.fieldname = auditField[i][2];
 					auditJson.oldvalue = old;
 					auditJson.newvalue = news;
+					auditJson.formid = auditFormId;
+					auditJson.doccode = doc;
+					auditJson.mainFormId = formId;//涓诲姛鑳藉彿锛屽湪涓夎〃鎴栧琛ㄦ椂MainFormId鍙栦富鍔熻兘鍙凤紝鍏朵粬鎯呭喌鍙栧�煎拰formid鐩稿悓鍙栧綋鍓嶅姛鑳藉彿
+					auditJson.headFlag = 0;//涓昏〃涓�0 浠庤〃涓�1
 					if ($doc(name + "_expr").val() != null && $doc(name + "_expr").val() == 0) {
 						var encrypt = new JSEncrypt();
 						encrypt.setPublicKey(rsakey.pubkey);
@@ -3402,16 +3417,8 @@
 						auditJson.newvalue_expr = 0;
 						auditJson.oldvalue = $doc(name + "_expr_val").val();
 						auditJson.newvalue = news;
+						auditJson.auditIndex_expr = news;//澶勭悊鍔犲瘑
 					}
-					auditJson.usercode = '';
-					auditJson.username = '';
-					auditJson.auditType = (typeof (type) == 'undefined' ? ((isNew == 1 && doc == "") ? "add" : "update") : (type == "2add" ? "add" : "update"));
-					auditJson.formid = auditFormId;
-					auditJson.doccode = doc;
-					auditJson.auditIndex = ',' + news + ',' + old + ',' + array.join(',')+',';
-					auditJson.auditIndex_expr = '';//澶勭悊鍔犲瘑
-					auditJson.mainFormId = formId;//涓诲姛鑳藉彿锛屽湪涓夎〃鎴栧琛ㄦ椂MainFormId鍙栦富鍔熻兘鍙凤紝鍏朵粬鎯呭喌鍙栧�煎拰formid鐩稿悓鍙栧綋鍓嶅姛鑳藉彿
-					auditJson.headFlag = 0;//涓昏〃涓�0 浠庤〃涓�1
 					newValue.push(auditJson);
 				}
 			}

--
Gitblit v1.8.0