v1.2.1版本,优化调整了很多,整改验收阶段新加字段

This commit is contained in:
王利强
2026-06-13 08:50:51 +08:00
parent 2af9f1fd59
commit 1fe87ec438
591 changed files with 5072 additions and 2706 deletions

View File

@@ -2,25 +2,76 @@
const common_vendor = require("../../common/vendor.js");
const request_api = require("../../request/api.js");
if (!Array) {
const _easycom_up_picker2 = common_vendor.resolveComponent("up-picker");
const _easycom_u_popup2 = common_vendor.resolveComponent("u-popup");
const _easycom_up_datetime_picker2 = common_vendor.resolveComponent("up-datetime-picker");
(_easycom_up_picker2 + _easycom_up_datetime_picker2)();
(_easycom_u_popup2 + _easycom_up_datetime_picker2)();
}
const _easycom_up_picker = () => "../../uni_modules/uview-plus/components/u-picker/u-picker.js";
const _easycom_u_popup = () => "../../uni_modules/uview-plus/components/u-popup/u-popup.js";
const _easycom_up_datetime_picker = () => "../../uni_modules/uview-plus/components/u-datetime-picker/u-datetime-picker.js";
if (!Math) {
(_easycom_up_picker + _easycom_up_datetime_picker)();
(_easycom_u_popup + _easycom_up_datetime_picker)();
}
const _sfc_main = {
__name: "assignment",
setup(__props) {
const hazardId = common_vendor.ref("");
const assignId = common_vendor.ref("");
const showUserPicker = common_vendor.ref(false);
const showUserPopup = common_vendor.ref(false);
const selectedUser = common_vendor.ref("");
const selectedUserId = common_vendor.ref("");
const userColumns = common_vendor.ref([["暂无数据"]]);
const userList = common_vendor.ref([]);
const deptList = common_vendor.ref([]);
const activeDeptIndex = common_vendor.ref(0);
const userPickerSelectedId = common_vendor.ref("");
const formatUserDisplayName = (user) => {
if (user.postName) {
return `${user.nickName}_${user.postName}`;
}
return user.nickName || "";
};
const currentDeptUsers = common_vendor.computed(() => {
const dept = deptList.value[activeDeptIndex.value];
return (dept == null ? void 0 : dept.users) || [];
});
const userPickerSelectedText = common_vendor.computed(() => {
if (!userPickerSelectedId.value)
return "";
for (const dept of deptList.value) {
const user = (dept.users || []).find((u) => String(u.userId) === String(userPickerSelectedId.value));
if (user)
return formatUserDisplayName(user);
}
return "";
});
const deptHasSelectedUser = (dept) => {
var _a;
if (!userPickerSelectedId.value || !((_a = dept.users) == null ? void 0 : _a.length))
return false;
return dept.users.some((user) => String(user.userId) === String(userPickerSelectedId.value));
};
const onUserItemClick = (userId) => {
userPickerSelectedId.value = String(userId);
};
const openUserPopup = () => {
userPickerSelectedId.value = selectedUserId.value;
const firstDeptWithUsers = deptList.value.findIndex((dept) => {
var _a;
return ((_a = dept.users) == null ? void 0 : _a.length) > 0;
});
activeDeptIndex.value = firstDeptWithUsers >= 0 ? firstDeptWithUsers : 0;
showUserPopup.value = true;
};
const cancelUserSelect = () => {
showUserPopup.value = false;
};
const confirmUserSelect = () => {
if (!userPickerSelectedId.value) {
common_vendor.index.showToast({ title: "请选择整改责任人", icon: "none" });
return;
}
selectedUserId.value = String(userPickerSelectedId.value);
selectedUser.value = userPickerSelectedText.value;
showUserPopup.value = false;
};
const showDatePicker = common_vendor.ref(false);
const dateValue = common_vendor.ref(Date.now());
const selectedDate = common_vendor.ref("");
@@ -28,38 +79,15 @@ const _sfc_main = {
try {
const res = await request_api.getDepartmentPersonUsers();
if (res.code === 0 && res.data) {
const users = [];
res.data.forEach((dept) => {
if (dept.users && dept.users.length > 0) {
dept.users.forEach((user) => {
users.push({
id: String(user.userId),
name: `${user.nickName}${dept.deptName}`
});
});
}
});
userList.value = users;
userColumns.value = [users.map((u) => u.name)];
common_vendor.index.__f__("log", "at pages/hiddendanger/assignment.vue:91", "整改人员列表:", users);
deptList.value = res.data;
common_vendor.index.__f__("log", "at pages/hiddendanger/assignment.vue:172", "部门人员树:", deptList.value);
}
} catch (error) {
common_vendor.index.__f__("error", "at pages/hiddendanger/assignment.vue:94", "获取部门人员失败:", error);
common_vendor.index.__f__("error", "at pages/hiddendanger/assignment.vue:175", "获取部门人员失败:", error);
}
};
const onUserConfirm = (e) => {
common_vendor.index.__f__("log", "at pages/hiddendanger/assignment.vue:100", "选择的人员:", e);
if (e.value && e.value.length > 0) {
selectedUser.value = e.value[0];
const user = userList.value.find((u) => u.name === e.value[0]);
if (user) {
selectedUserId.value = user.id;
}
}
showUserPicker.value = false;
};
const onDateConfirm = (e) => {
common_vendor.index.__f__("log", "at pages/hiddendanger/assignment.vue:114", "选择的日期时间:", e);
common_vendor.index.__f__("log", "at pages/hiddendanger/assignment.vue:181", "选择的日期时间:", e);
const date = new Date(e.value);
const year = date.getFullYear();
const month = String(date.getMonth() + 1).padStart(2, "0");
@@ -92,7 +120,7 @@ const _sfc_main = {
assignRemark: ""
// 交办备注(可选)
};
common_vendor.index.__f__("log", "at pages/hiddendanger/assignment.vue:150", "提交数据:", params);
common_vendor.index.__f__("log", "at pages/hiddendanger/assignment.vue:217", "提交数据:", params);
try {
const res = await request_api.assignHiddenDanger(params);
if (res.code === 0) {
@@ -105,7 +133,7 @@ const _sfc_main = {
common_vendor.index.showToast({ title: res.msg || "交办失败", icon: "none" });
}
} catch (error) {
common_vendor.index.__f__("error", "at pages/hiddendanger/assignment.vue:164", "交办失败:", error);
common_vendor.index.__f__("error", "at pages/hiddendanger/assignment.vue:231", "交办失败:", error);
common_vendor.index.showToast({ title: "请求失败", icon: "none" });
}
};
@@ -168,7 +196,7 @@ const _sfc_main = {
duration: 2500
});
} catch (e) {
common_vendor.index.__f__("error", "at pages/hiddendanger/assignment.vue:239", "解析草稿失败:", e);
common_vendor.index.__f__("error", "at pages/hiddendanger/assignment.vue:306", "解析草稿失败:", e);
isRestoring.value = false;
}
}
@@ -195,31 +223,63 @@ const _sfc_main = {
}, showRestoreBanner.value ? {
b: common_vendor.o(($event) => clearDraft(true))
} : {}, {
c: common_vendor.t(selectedUser.value || "请选择整改人"),
d: common_vendor.n(selectedUser.value ? "" : "text-gray"),
e: common_vendor.o(($event) => showUserPicker.value = true),
f: common_vendor.o(onUserConfirm),
g: common_vendor.o(($event) => showUserPicker.value = false),
h: common_vendor.o(($event) => showUserPicker.value = false),
i: common_vendor.p({
show: showUserPicker.value,
columns: userColumns.value
c: common_vendor.t(selectedUser.value || "请选择整改责任人"),
d: !selectedUser.value ? 1 : "",
e: common_vendor.o(openUserPopup),
f: common_vendor.o(cancelUserSelect),
g: userPickerSelectedId.value
}, userPickerSelectedId.value ? {
h: common_vendor.t(userPickerSelectedText.value)
} : {}, {
i: common_vendor.f(deptList.value, (dept, index, i0) => {
return common_vendor.e({
a: common_vendor.t(dept.deptName),
b: deptHasSelectedUser(dept)
}, deptHasSelectedUser(dept) ? {} : {}, {
c: dept.deptId,
d: common_vendor.n({
active: activeDeptIndex.value === index
}),
e: common_vendor.o(($event) => activeDeptIndex.value = index, dept.deptId)
});
}),
j: common_vendor.t(selectedDate.value || "请选择整改期限"),
k: common_vendor.n(selectedDate.value ? "" : "text-gray"),
l: common_vendor.o(($event) => showDatePicker.value = true),
m: common_vendor.o(onDateConfirm),
n: common_vendor.o(($event) => showDatePicker.value = false),
o: common_vendor.o(($event) => showDatePicker.value = false),
p: common_vendor.o(($event) => dateValue.value = $event),
q: common_vendor.p({
j: currentDeptUsers.value.length === 0
}, currentDeptUsers.value.length === 0 ? {} : {
k: common_vendor.f(currentDeptUsers.value, (user, k0, i0) => {
return common_vendor.e({
a: common_vendor.t(formatUserDisplayName(user)),
b: String(userPickerSelectedId.value) === String(user.userId)
}, String(userPickerSelectedId.value) === String(user.userId) ? {} : {}, {
c: "user-" + user.userId,
d: String(userPickerSelectedId.value) === String(user.userId) ? 1 : "",
e: common_vendor.o(($event) => onUserItemClick(user.userId), "user-" + user.userId)
});
})
}, {
l: "dept-users-" + activeDeptIndex.value,
m: common_vendor.o(cancelUserSelect),
n: common_vendor.o(confirmUserSelect),
o: common_vendor.o(cancelUserSelect),
p: common_vendor.p({
show: showUserPopup.value,
mode: "bottom",
round: "20"
}),
q: common_vendor.t(selectedDate.value || "请选择整改期限"),
r: common_vendor.n(selectedDate.value ? "" : "text-gray"),
s: common_vendor.o(($event) => showDatePicker.value = true),
t: common_vendor.o(onDateConfirm),
v: common_vendor.o(($event) => showDatePicker.value = false),
w: common_vendor.o(($event) => showDatePicker.value = false),
x: common_vendor.o(($event) => dateValue.value = $event),
y: common_vendor.p({
show: showDatePicker.value,
mode: "datetime",
modelValue: dateValue.value
}),
r: common_vendor.o(handleCancel),
s: common_vendor.o(handleSubmit),
t: common_vendor.gei(_ctx, "")
z: common_vendor.o(handleCancel),
A: common_vendor.o(handleSubmit),
B: common_vendor.gei(_ctx, "")
});
};
}