Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI

qq_41295110

2026-01-21 6235fa7c1cc6a5a11dbdd2a3003f1085fc65acc8

 src/views/system/user/xtUserListEdit.vue

@@ -327,15 +327,18 @@
        Czybm: [
          { required: true, message: "编码不能为空!", trigger: "blur" }
        ],
        Czybm: [
          { required: true, message: "编码不能为空!", trigger: "blur" }
        Czymc: [
          { required: true, message: "用户名不能为空!", trigger: "blur" }
        ],
        Czmm: [
          { required: true, message: "用户名不能为空!", trigger: "blur" }
          { required: true, message: "密码不能为空!", trigger: "blur" }
        ],
        Czyyz: [
          { required: true, message: "确认密码不能为空!", trigger: "blur" },
          { required: true, validator: equalToPassword, trigger: "blur" }
        ],
        HDept: [
          { required: true, message: "对应部门不能为空!", trigger: "blur" }
        ],
        HWHName: [
          { validator: equalToHWHName, trigger: "blur" }
@@ -364,7 +367,7 @@
    },
    getUserGroup() {
      //角色列表
      axios.get(this.baseURL + '/Xt_UserGroup/list', {
      axios.get(this.$baseUrl + '/Xt_UserGroup/list', {
        params: {
          sWhere: '',
        },
@@ -380,7 +383,7 @@
    },
    get_DisplayUserGroupInfoList() {
      var sWhere = "and UserId='" + this.linterid + "'";
      axios.get(this.baseURL + '/Xt_UserGroup/UserGroupInfoList', {
      axios.get(this.$baseUrl + '/Xt_UserGroup/UserGroupInfoList', {
        params: {
          sWhere: sWhere,
        },
@@ -410,7 +413,7 @@
    },
    //根据主内码与子内码获取源单销售订单数据
    getPushSourceBillInit(HSourceInterID, HSourceEntryID) {
      axios.get(this.baseURL + '/Xs_SeOrderBill/loadXs_SeOrderBill_Push', {
      axios.get(this.$baseUrl + '/Xs_SeOrderBill/loadXs_SeOrderBill_Push', {
        params: {
          "HInterID": HSourceInterID
          , "HSubID": HSourceEntryID
@@ -590,7 +593,7 @@
    handleUpdate() {
      this.reset()
      let rowHmainid = this.linterid
      axios.get(this.baseURL + "/Xt_User/EditUser", {
      axios.get(this.$baseUrl + "/Xt_User/EditUser", {
        params: { 'HID': rowHmainid }
      }).then(response => {
        if (response.data.code == 1) {
@@ -654,37 +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);
      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