|
@@ -249,7 +249,7 @@
|
|
var departmentId = $("#departmentId").val();
|
|
var departmentId = $("#departmentId").val();
|
|
var newDepartmentId = $("#newDepartmentId").val();
|
|
var newDepartmentId = $("#newDepartmentId").val();
|
|
var newDepartmentText = $("#newDepartmentId").find("option:selected").text();
|
|
var newDepartmentText = $("#newDepartmentId").find("option:selected").text();
|
|
- if (isAll) {
|
|
|
|
|
|
+ if (isAll && newDepartmentId) {
|
|
// if (!newDepartmentId || newDepartmentId == "请选择") {
|
|
// if (!newDepartmentId || newDepartmentId == "请选择") {
|
|
// $.alert("请选择二级部门")
|
|
// $.alert("请选择二级部门")
|
|
// return false;
|
|
// return false;
|
|
@@ -283,6 +283,7 @@
|
|
var unitId = $("#unitId").val();
|
|
var unitId = $("#unitId").val();
|
|
var newUnitId = $("#newUnitId").val();
|
|
var newUnitId = $("#newUnitId").val();
|
|
var newUnitText = $("#newUnitId").find("option:selected").text();
|
|
var newUnitText = $("#newUnitId").find("option:selected").text();
|
|
|
|
+ var newDepartmentId = $("#newDepartmentId").val();
|
|
if (!newUnitId || newUnitId == "请选择") {
|
|
if (!newUnitId || newUnitId == "请选择") {
|
|
$.alert("请选择部门")
|
|
$.alert("请选择部门")
|
|
return false;
|
|
return false;
|
|
@@ -297,7 +298,7 @@
|
|
data: {
|
|
data: {
|
|
userId: $('#userId').val(),
|
|
userId: $('#userId').val(),
|
|
newUnitId: newUnitId,
|
|
newUnitId: newUnitId,
|
|
- newDepartmentId: 0,
|
|
|
|
|
|
+ newDepartmentId: newDepartmentId,
|
|
}, success: function (date) {
|
|
}, success: function (date) {
|
|
$("#unitId").val(newUnitId);
|
|
$("#unitId").val(newUnitId);
|
|
$("#unitMsg").text(newUnitText);
|
|
$("#unitMsg").text(newUnitText);
|