From c3ceee9402fd69f87797ed82137b82217aff63e4 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期日, 04 一月 2026 18:16:23 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI

---
 src/views/system/user/xtUserListEdit.vue |   84 ++++++++++++++++++++++++-----------------
 1 files changed, 49 insertions(+), 35 deletions(-)

diff --git a/src/views/system/user/xtUserListEdit.vue b/src/views/system/user/xtUserListEdit.vue
index 3a83f71..00c11d1 100644
--- a/src/views/system/user/xtUserListEdit.vue
+++ b/src/views/system/user/xtUserListEdit.vue
@@ -327,9 +327,6 @@
         Czybm: [
           { required: true, message: "缂栫爜涓嶈兘涓虹┖!", trigger: "blur" }
         ],
-        Czybm: [
-          { required: true, message: "缂栫爜涓嶈兘涓虹┖!", trigger: "blur" }
-        ],
         Czymc: [
           { required: true, message: "鐢ㄦ埛鍚嶄笉鑳戒负绌�!", trigger: "blur" }
         ],
@@ -660,39 +657,56 @@
     },
     // 缂栬緫鎻愪氦淇濆瓨
     submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          var num = [];
-          var Sav = ''
-          if (this.OperationType == 1) {
-            Sav = 'Add'
-          } else if (this.OperationType == 3) {
-            Sav = "Update"
-          }
-          for (var i = 0; i < this.checkedSysZb.length; i++) {
-            num.push(this.checkedSysZb[i].HGroupID)
-          }
-          var sSubStr = num.toString() == "" ? "-1" : num.toString();
-          var sMainStr = JSON.stringify(this.form) + ';' + Sav + ';' + sSubStr;
-          axios({
-            method: 'post',
-            url: this.baseURL + "/Xt_User/SaveUser",
-            data: {
-              'msg': sMainStr
-            },
-          }).then(response => {
-            if (response.data.count == 1) {
-              this.formShow = false
-              this.$emit('editClose', false)
-              this.$modal.msgSuccess(response.data.Message);
-            } else {
-              this.$modal.msgError(response.data.Message)
+      if (!this.form.Czybm) {
+        this.$modal.msgError("缂栫爜涓嶈兘涓虹┖!");
+      } else if (!this.form.Czymc) {
+        this.$modal.msgError("鐢ㄦ埛鍚嶄笉鑳戒负绌�!");
+      } else if (!this.form.Czmm) {
+        this.$modal.msgError("瀵嗙爜涓嶈兘涓虹┖!");
+      } else if (!this.form.Czyyz) {
+        this.$modal.msgError("纭瀵嗙爜涓嶈兘涓虹┖!");
+      } else if (this.form.Czmm != this.form.Czyyz) {
+        this.$modal.msgError("瀵嗙爜鍜岀‘璁ゅ瘑鐮佷笉涓�鏍�!");
+      } else if (!this.form.HDept) {
+        this.$modal.msgError("閮ㄩ棬涓嶈兘涓虹┖!");
+      } else if (this.form.HWHName == this.form.HSCWHName) {
+        this.$modal.msgError("瀵瑰簲浠撳簱鍜岃皟鍏ヤ粨搴撲笉鑳界浉鍚岋紒");
+      } else {
+        this.$refs["form"].validate(valid => {
+          if (valid) {
+
+            var num = [];
+            var Sav = ''
+            if (this.OperationType == 1) {
+              Sav = 'Add'
+            } else if (this.OperationType == 3) {
+              Sav = "Update"
             }
-          }).catch(error => {
-            this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
-          });
-        }
-      });
+            for (var i = 0; i < this.checkedSysZb.length; i++) {
+              num.push(this.checkedSysZb[i].HGroupID)
+            }
+            var sSubStr = num.toString() == "" ? "-1" : num.toString();
+            var sMainStr = JSON.stringify(this.form) + ';' + Sav + ';' + sSubStr;
+            axios({
+              method: 'post',
+              url: this.baseURL + "/Xt_User/SaveUser",
+              data: {
+                'msg': sMainStr
+              },
+            }).then(response => {
+              if (response.data.count == 1) {
+                this.formShow = false
+                this.$emit('editClose', false)
+                this.$modal.msgSuccess(response.data.Message);
+              } else {
+                this.$modal.msgError(response.data.Message)
+              }
+            }).catch(error => {
+              this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+            });
+          }
+        });
+      }
     },
     showReset() {
       this.deptShow = false

--
Gitblit v1.9.1