交办时间年月日，整改时回显整改人

unpackage/dist/dev/mp-weixin/pages/editchecklist/editchecklist.js

@@ -32,28 +32,113 @@ const _sfc_main = {
       modeName: "",
       selectDeptId: "",
       selectDeptName: "",
-      executorIds: [],
-      // 执行人员ID数组
+      executorId: "",
       executorNames: "",
-      // 执行人员名称（显示用）
       cycleId: "",
       cycleName: "",
+      isWeekend: 1,
       startDate: "",
       endDate: ""
     });
-    const workdaySwitch = common_vendor.ref(false);
-    const onSwitchChange = (e) => {
-      workdaySwitch.value = e.detail.value;
-    };
     const getTodayTimestamp = () => {
       const now = /* @__PURE__ */ new Date();
       return new Date(now.getFullYear(), now.getMonth(), now.getDate()).getTime();
     };
+    const formatDate = (timestamp) => {
+      const date = new Date(timestamp);
+      const year = date.getFullYear();
+      const month = String(date.getMonth() + 1).padStart(2, "0");
+      const day = String(date.getDate()).padStart(2, "0");
+      return `${year}-${month}-${day}`;
+    };
+    const handleTree = (data, id = "deptId", parentId = "parentId", children = "children") => {
+      const childrenListMap = {};
+      const tree = [];
+      data.forEach((item) => {
+        childrenListMap[item[id]] = { ...item, [children]: item[children] || [] };
+      });
+      data.forEach((item) => {
+        const node = childrenListMap[item[id]];
+        const parentObj = childrenListMap[item[parentId]];
+        if (!parentObj) {
+          tree.push(node);
+        } else {
+          parentObj[children].push(node);
+        }
+      });
+      return tree;
+    };
+    const isWeekendDate = (date) => {
+      const day = date.getDay();
+      return day === 0 || day === 6;
+    };
+    const isWeekendDateString = (dateStr) => {
+      if (!dateStr)
+        return false;
+      const [year, month, day] = String(dateStr).split(" ")[0].split("-").map(Number);
+      return isWeekendDate(new Date(year, month - 1, day));
+    };
+    const isDateDisabled = (dateStr) => {
+      const todayStr = formatDate(getTodayTimestamp());
+      if (dateStr < todayStr)
+        return true;
+      if (Number(formData.isWeekend) === 2 && isWeekendDateString(dateStr))
+        return true;
+      return false;
+    };
+    const setIsWeekend = (value) => {
+      formData.isWeekend = value;
+      if (Number(value) === 2) {
+        if (isWeekendDateString(formData.startDate)) {
+          formData.startDate = "";
+        }
+        if (isWeekendDateString(formData.endDate)) {
+          formData.endDate = "";
+        }
+      }
+    };
+    const startPickerContext = common_vendor.ref(getTodayTimestamp());
+    const endPickerContext = common_vendor.ref(getTodayTimestamp());
+    const buildWeekendDayFilter = (contextRef) => {
+      return (type, values) => {
+        if (Number(formData.isWeekend) !== 2 || type !== "day") {
+          return values;
+        }
+        const current = new Date(contextRef.value);
+        const year = current.getFullYear();
+        const month = current.getMonth();
+        const filtered = values.filter((dayStr) => {
+          const date = new Date(year, month, Number(dayStr));
+          return !isWeekendDate(date);
+        });
+        return filtered.length > 0 ? filtered : values;
+      };
+    };
+    const startDateFilter = common_vendor.computed(() => {
+      return Number(formData.isWeekend) === 2 ? buildWeekendDayFilter(startPickerContext) : null;
+    });
+    const endDateFilter = common_vendor.computed(() => {
+      return Number(formData.isWeekend) === 2 ? buildWeekendDayFilter(endPickerContext) : null;
+    });
+    const getNextAvailableTimestamp = (timestamp, minTimestamp = getTodayTimestamp()) => {
+      let date = new Date(Math.max(timestamp, minTimestamp));
+      let guard = 0;
+      while (guard < 366) {
+        const isPast = date.getTime() < minTimestamp;
+        const isWeekendBlocked = Number(formData.isWeekend) === 2 && isWeekendDate(date);
+        if (!isPast && !isWeekendBlocked) {
+          return date.getTime();
+        }
+        date.setDate(date.getDate() + 1);
+        guard++;
+      }
+      return date.getTime();
+    };
     const todayMinDate = common_vendor.computed(() => getTodayTimestamp());
     const endDateMinDate = common_vendor.computed(() => {
       if (formData.startDate) {
         const [year, month, day] = formData.startDate.split("-").map(Number);
-        return new Date(year, month - 1, day).getTime();
+        return new Date(year, month - 1, day + 1).getTime();
       }
       return getTodayTimestamp();
     });
@@ -68,20 +153,22 @@ const _sfc_main = {
     const showEndDatePicker = common_vendor.ref(false);
     common_vendor.ref([["湘西自治州和谐网络科技有限公司", "湘西自治州和谐云大数据科技有限公司", "湘西网络有限公司"]]);
     const typeColumns = common_vendor.ref([["日常检查", "专项检查", "设备检查"]]);
-    const modeColumns = common_vendor.ref([["全员", "指定人员"]]);
+    const modeColumns = common_vendor.ref([["单人完成", "全员"]]);
     const cycleColumns = common_vendor.ref([["每天一次", "每周一次", "每月一次", "每季度一次"]]);
     const showExecutorPopup = common_vendor.ref(false);
     const executorList = common_vendor.ref([]);
-    const selectedExecutorIds = common_vendor.ref([]);
+    const selectedExecutorId = common_vendor.ref(null);
     const deptTree = common_vendor.ref([]);
     const deptCascaderColumns = common_vendor.ref([]);
     const deptCascaderIndexs = common_vendor.ref([0]);
     const selectedDeptPath = common_vendor.ref([]);
-    const onDeptConfirm = (e) => {
+    const onDeptConfirm = () => {
       const lastSelected = selectedDeptPath.value[selectedDeptPath.value.length - 1];
       if (lastSelected) {
         formData.deptId = lastSelected.deptId;
         formData.deptName = selectedDeptPath.value.map((d) => d.deptName).join(" / ");
+        clearExecutorSelection();
+        fetchDeptUsers(lastSelected.deptId);
       }
       showDeptPicker.value = false;
     };
@@ -101,75 +188,84 @@ const _sfc_main = {
       if (e.value && e.value.length > 0) {
         formData.modeName = e.value[0];
         if (e.value[0] === "全员") {
-          formData.executorIds = [];
-          formData.executorNames = "";
-          selectedExecutorIds.value = [];
+          clearExecutorSelection();
         }
       }
       showModePicker.value = false;
     };
-    const fetchDeptUsers = async () => {
+    const clearExecutorSelection = () => {
+      formData.executorId = "";
+      formData.executorNames = "";
+      selectedExecutorId.value = null;
+    };
+    const fetchDeptUsers = async (deptId) => {
+      if (!deptId) {
+        executorList.value = [];
+        return;
+      }
       try {
-        const res = await request_api.getDeptUsers();
+        const res = await request_api.getDeptUsers(deptId);
         if (res.code === 0 && res.data) {
           executorList.value = res.data || [];
+        } else {
+          executorList.value = [];
         }
       } catch (error) {
-        common_vendor.index.__f__("error", "at pages/editchecklist/editchecklist.vue:522", "获取部门用户失败:", error);
+        common_vendor.index.__f__("error", "at pages/editchecklist/editchecklist.vue:641", "获取部门用户失败:", error);
+        executorList.value = [];
       }
     };
-    const toggleExecutorSelect = (item) => {
-      const index = selectedExecutorIds.value.indexOf(item.userId);
-      if (index > -1) {
-        selectedExecutorIds.value.splice(index, 1);
-      } else {
-        selectedExecutorIds.value.push(item.userId);
-      }
+    const selectExecutor = (item) => {
+      selectedExecutorId.value = item.userId;
     };
     const confirmExecutorSelect = () => {
-      formData.executorIds = [...selectedExecutorIds.value];
-      const selectedUsers = executorList.value.filter((u) => selectedExecutorIds.value.includes(u.userId));
-      formData.executorNames = selectedUsers.map((u) => u.nickName).join("、");
+      if (!selectedExecutorId.value) {
+        common_vendor.index.showToast({ title: "请选择执行人员", icon: "none" });
+        return;
+      }
+      const selectedUser = executorList.value.find((u) => u.userId === selectedExecutorId.value);
+      formData.executorId = selectedExecutorId.value;
+      formData.executorNames = (selectedUser == null ? void 0 : selectedUser.nickName) || (selectedUser == null ? void 0 : selectedUser.nickname) || "";
       showExecutorPopup.value = false;
     };
     const openExecutorPopup = () => {
-      selectedExecutorIds.value = [...formData.executorIds];
+      if (!formData.deptId) {
+        common_vendor.index.showToast({ title: "请先选择分派单位", icon: "none" });
+        return;
+      }
+      selectedExecutorId.value = formData.executorId || null;
+      fetchDeptUsers(formData.deptId);
       showExecutorPopup.value = true;
     };
-    const fetchParentDepts = async () => {
+    const fetchDeptChildren = async () => {
       try {
-        const res = await request_api.getParentDepts();
+        const res = await request_api.getDeptChildren();
         if (res.code === 0 && res.data) {
-          deptTree.value = res.data;
-          initDeptCascader(res.data);
+          const list = Array.isArray(res.data) ? res.data : [];
+          deptTree.value = handleTree(list, "deptId");
+          initDeptCascader(deptTree.value);
         }
       } catch (error) {
-        common_vendor.index.__f__("error", "at pages/editchecklist/editchecklist.vue:560", "获取部门树失败:", error);
+        common_vendor.index.__f__("error", "at pages/editchecklist/editchecklist.vue:680", "获取部门树失败:", error);
       }
     };
-    const initDeptCascader = (data) => {
-      if (!data)
+    const initDeptCascader = (treeData) => {
+      const roots = Array.isArray(treeData) ? treeData : treeData ? [treeData] : [];
+      if (roots.length === 0)
         return;
-      const firstColumn = buildDeptColumn(data);
+      const firstColumn = roots.map((item) => ({ text: item.deptName, ...item }));
       deptCascaderColumns.value = [firstColumn];
       deptCascaderIndexs.value = [0];
-      selectedDeptPath.value = [data];
-      if (data.children && data.children.length > 0) {
-        const secondColumn = data.children.map((item) => ({ text: item.deptName, ...item }));
-        deptCascaderColumns.value.push(secondColumn);
+      selectedDeptPath.value = [roots[0]];
+      let current = roots[0];
+      while (current.children && current.children.length > 0) {
+        const nextColumn = current.children.map((item) => ({ text: item.deptName, ...item }));
+        deptCascaderColumns.value.push(nextColumn);
         deptCascaderIndexs.value.push(0);
-        selectedDeptPath.value.push(data.children[0]);
-        if (data.children[0].children && data.children[0].children.length > 0) {
-          const thirdColumn = data.children[0].children.map((item) => ({ text: item.deptName, ...item }));
-          deptCascaderColumns.value.push(thirdColumn);
-          deptCascaderIndexs.value.push(0);
-          selectedDeptPath.value.push(data.children[0].children[0]);
-        }
+        selectedDeptPath.value.push(current.children[0]);
+        current = current.children[0];
       }
     };
-    const buildDeptColumn = (data) => {
-      return [{ text: data.deptName, ...data }];
-    };
     const onDeptCascaderChange = (e) => {
       const { columnIndex, index, value } = e;
       deptCascaderIndexs.value[columnIndex] = index;
@@ -196,13 +292,6 @@ const _sfc_main = {
       }
       showCyclePicker.value = false;
     };
-    const formatDate = (timestamp) => {
-      const date = new Date(timestamp);
-      const year = date.getFullYear();
-      const month = String(date.getMonth() + 1).padStart(2, "0");
-      const day = String(date.getDate()).padStart(2, "0");
-      return `${year}-${month}-${day}`;
-    };
     const parseDateValue = (dateStr) => {
       if (!dateStr)
         return 0;
@@ -211,37 +300,56 @@ const _sfc_main = {
       return new Date(year, month - 1, day).getTime();
     };
     const openStartDatePicker = () => {
-      const today = getTodayTimestamp();
-      if (startDateValue.value < today) {
-        startDateValue.value = today;
-      }
+      const candidate = formData.startDate ? parseDateValue(formData.startDate) : getTodayTimestamp();
+      startDateValue.value = getNextAvailableTimestamp(candidate);
+      startPickerContext.value = startDateValue.value;
       showStartDatePicker.value = true;
     };
     const openEndDatePicker = () => {
-      const minDate = endDateMinDate.value;
-      if (endDateValue.value < minDate) {
-        endDateValue.value = minDate;
+      if (!formData.startDate) {
+        common_vendor.index.showToast({ title: "请先选择计划开始日期", icon: "none" });
+        return;
       }
+      const minDate = endDateMinDate.value;
+      const candidate = formData.endDate ? parseDateValue(formData.endDate) : minDate;
+      endDateValue.value = getNextAvailableTimestamp(candidate, minDate);
+      endPickerContext.value = endDateValue.value;
       showEndDatePicker.value = true;
     };
+    const onStartDatePickerChange = (e) => {
+      startPickerContext.value = e.value;
+      startDateValue.value = e.value;
+    };
+    const onEndDatePickerChange = (e) => {
+      endPickerContext.value = e.value;
+      endDateValue.value = e.value;
+    };
     const onStartDateConfirm = (e) => {
       const selectedDate = formatDate(e.value);
-      const todayStr = formatDate(getTodayTimestamp());
-      if (selectedDate < todayStr) {
-        common_vendor.index.showToast({ title: "开始时间不能早于今天", icon: "none" });
+      if (isDateDisabled(selectedDate)) {
+        common_vendor.index.showToast({
+          title: Number(formData.isWeekend) === 2 ? "不能选择周末或今天之前的日期" : "开始日期不能早于今天",
+          icon: "none"
+        });
         return;
       }
-      if (formData.endDate && parseDateValue(selectedDate) > parseDateValue(formData.endDate)) {
-        common_vendor.index.showToast({ title: "开始时间不能晚于结束时间", icon: "none" });
-        return;
+      if (formData.endDate && parseDateValue(selectedDate) >= parseDateValue(formData.endDate)) {
+        formData.endDate = "";
       }
       formData.startDate = selectedDate;
       showStartDatePicker.value = false;
     };
     const onEndDateConfirm = (e) => {
       const selectedDate = formatDate(e.value);
-      if (formData.startDate && parseDateValue(selectedDate) < parseDateValue(formData.startDate)) {
-        common_vendor.index.showToast({ title: "结束时间不能早于开始时间", icon: "none" });
+      if (isDateDisabled(selectedDate)) {
+        common_vendor.index.showToast({
+          title: Number(formData.isWeekend) === 2 ? "不能选择周末或今天之前的日期" : "结束日期不能早于今天",
+          icon: "none"
+        });
+        return;
+      }
+      if (formData.startDate && parseDateValue(selectedDate) <= parseDateValue(formData.startDate)) {
+        common_vendor.index.showToast({ title: "计划结束日期必须晚于计划开始日期", icon: "none" });
         return;
       }
       formData.endDate = selectedDate;
@@ -284,7 +392,7 @@ const _sfc_main = {
                 }
               } catch (error) {
                 common_vendor.index.hideLoading();
-                common_vendor.index.__f__("error", "at pages/editchecklist/editchecklist.vue:740", "删除检查项失败:", error);
+                common_vendor.index.__f__("error", "at pages/editchecklist/editchecklist.vue:867", "删除检查项失败:", error);
                 common_vendor.index.showToast({ title: "删除失败", icon: "none" });
               }
             } else {
@@ -360,7 +468,7 @@ const _sfc_main = {
           hasMoreLaw.value = lawList.value.length < total;
         }
       } catch (error) {
-        common_vendor.index.__f__("error", "at pages/editchecklist/editchecklist.vue:827", "获取法规列表失败:", error);
+        common_vendor.index.__f__("error", "at pages/editchecklist/editchecklist.vue:954", "获取法规列表失败:", error);
       } finally {
         lawLoading.value = false;
       }
@@ -440,7 +548,7 @@ const _sfc_main = {
         }
       } catch (error) {
         common_vendor.index.hideLoading();
-        common_vendor.index.__f__("error", "at pages/editchecklist/editchecklist.vue:927", "添加检查项失败:", error);
+        common_vendor.index.__f__("error", "at pages/editchecklist/editchecklist.vue:1054", "添加检查项失败:", error);
         common_vendor.index.showToast({ title: "添加失败", icon: "none" });
       }
     };
@@ -489,7 +597,7 @@ const _sfc_main = {
           hasMoreLibrary.value = libraryList.value.length < total;
         }
       } catch (error) {
-        common_vendor.index.__f__("error", "at pages/editchecklist/editchecklist.vue:987", "获取检查库列表失败:", error);
+        common_vendor.index.__f__("error", "at pages/editchecklist/editchecklist.vue:1114", "获取检查库列表失败:", error);
       } finally {
         libraryLoading.value = false;
       }
@@ -592,7 +700,7 @@ const _sfc_main = {
         selectedLibraries.value = [];
       } catch (error) {
         common_vendor.index.hideLoading();
-        common_vendor.index.__f__("error", "at pages/editchecklist/editchecklist.vue:1107", "获取检查库详情失败:", error);
+        common_vendor.index.__f__("error", "at pages/editchecklist/editchecklist.vue:1234", "获取检查库详情失败:", error);
         common_vendor.index.showToast({ title: "添加失败", icon: "none" });
       }
     };
@@ -610,10 +718,10 @@ const _sfc_main = {
         return;
       }
       if (!formData.modeName) {
-        common_vendor.index.showToast({ title: "请选择运行模式", icon: "none" });
+        common_vendor.index.showToast({ title: "请选择模式", icon: "none" });
         return;
       }
-      if (formData.modeName === "指定人员" && formData.executorIds.length === 0) {
+      if (formData.modeName === "单人完成" && !formData.executorId) {
         common_vendor.index.showToast({ title: "请选择执行人员", icon: "none" });
         return;
       }
@@ -622,11 +730,11 @@ const _sfc_main = {
         return;
       }
       if (!formData.startDate || !formData.endDate) {
-        common_vendor.index.showToast({ title: "请选择计划时间", icon: "none" });
+        common_vendor.index.showToast({ title: "请选择计划日期", icon: "none" });
         return;
       }
-      if (parseDateValue(formData.endDate) < parseDateValue(formData.startDate)) {
-        common_vendor.index.showToast({ title: "结束时间不能早于开始时间", icon: "none" });
+      if (parseDateValue(formData.endDate) <= parseDateValue(formData.startDate)) {
+        common_vendor.index.showToast({ title: "计划结束日期必须晚于计划开始日期", icon: "none" });
         return;
       }
       const items = [];
@@ -645,7 +753,7 @@ const _sfc_main = {
         return;
       }
       const runModeMap = {
-        "指定人员": 1,
+        "单人完成": 1,
         "全员": 2
       };
       const cycleMap = {
@@ -668,12 +776,12 @@ const _sfc_main = {
         itemIds,
         // 从检查库选择的库id数组
         cycle: cycleMap[formData.cycleName] || 1,
-        isWeekend: workdaySwitch.value ? 1 : 2,
+        isWeekend: formData.isWeekend,
         planStartTime: `${formData.startDate} 00:00:00`,
-        planEndTime: `${formData.endDate} 23:59:59`
+        planEndTime: `${formData.endDate} 00:00:00`
       };
-      if (formData.modeName === "指定人员" && formData.executorIds.length > 0) {
-        params.executorId = formData.executorIds[0];
+      if (formData.modeName === "单人完成" && formData.executorId) {
+        params.executorId = formData.executorId;
       }
       try {
         common_vendor.index.showLoading({ title: "保存中..." });
@@ -689,13 +797,12 @@ const _sfc_main = {
         }
       } catch (error) {
         common_vendor.index.hideLoading();
-        common_vendor.index.__f__("error", "at pages/editchecklist/editchecklist.vue:1225", "保存失败:", error);
+        common_vendor.index.__f__("error", "at pages/editchecklist/editchecklist.vue:1349", "保存失败:", error);
         common_vendor.index.showToast({ title: "保存失败", icon: "none" });
       }
     };
     common_vendor.onMounted(() => {
-      fetchDeptUsers();
-      fetchParentDepts();
+      fetchDeptChildren();
     });
     return (_ctx, _cache) => {
       return common_vendor.e({
@@ -732,7 +839,7 @@ const _sfc_main = {
           show: showTypePicker.value,
           columns: typeColumns.value
         }),
-        t: common_vendor.t(formData.modeName || "请选择运行模式"),
+        t: common_vendor.t(formData.modeName || "请选择模式"),
         v: common_vendor.n(formData.modeName ? "picker-value" : "picker-placeholder"),
         w: common_vendor.o(($event) => showModePicker.value = true),
         x: common_vendor.o(onModeConfirm),
@@ -742,9 +849,9 @@ const _sfc_main = {
           show: showModePicker.value,
           columns: modeColumns.value
         }),
-        B: formData.modeName === "指定人员"
-      }, formData.modeName === "指定人员" ? {
-        C: common_vendor.t(formData.executorNames || "请选择执行人员"),
+        B: formData.modeName === "单人完成"
+      }, formData.modeName === "单人完成" ? {
+        C: common_vendor.t(formData.executorNames || (formData.deptId ? "请选择执行人员" : "请先选择分派单位")),
         D: common_vendor.n(formData.executorNames ? "picker-value" : "picker-placeholder"),
         E: common_vendor.o(openExecutorPopup)
       } : {}, {
@@ -758,38 +865,44 @@ const _sfc_main = {
           show: showCyclePicker.value,
           columns: cycleColumns.value
         }),
-        M: workdaySwitch.value,
-        N: common_vendor.o(onSwitchChange),
-        O: common_vendor.t(formData.startDate || "请选择开始时间"),
-        P: common_vendor.n(formData.startDate ? "picker-value" : "picker-placeholder"),
-        Q: common_vendor.o(openStartDatePicker),
-        R: common_vendor.o(onStartDateConfirm),
-        S: common_vendor.o(($event) => showStartDatePicker.value = false),
-        T: common_vendor.o(($event) => showStartDatePicker.value = false),
-        U: common_vendor.o(($event) => startDateValue.value = $event),
-        V: common_vendor.p({
+        M: formData.isWeekend === 1 ? 1 : "",
+        N: common_vendor.o(($event) => setIsWeekend(1)),
+        O: formData.isWeekend === 2 ? 1 : "",
+        P: common_vendor.o(($event) => setIsWeekend(2)),
+        Q: common_vendor.t(formData.startDate || "请选择计划开始日期"),
+        R: common_vendor.n(formData.startDate ? "picker-value" : "picker-placeholder"),
+        S: common_vendor.o(openStartDatePicker),
+        T: common_vendor.o(onStartDatePickerChange),
+        U: common_vendor.o(onStartDateConfirm),
+        V: common_vendor.o(($event) => showStartDatePicker.value = false),
+        W: common_vendor.o(($event) => showStartDatePicker.value = false),
+        X: common_vendor.o(($event) => startDateValue.value = $event),
+        Y: common_vendor.p({
           show: showStartDatePicker.value,
           mode: "date",
           minDate: todayMinDate.value,
+          filter: startDateFilter.value,
           modelValue: startDateValue.value
         }),
-        W: common_vendor.t(formData.endDate || "请选择结束时间"),
-        X: common_vendor.n(formData.endDate ? "picker-value" : "picker-placeholder"),
-        Y: common_vendor.o(openEndDatePicker),
-        Z: common_vendor.o(onEndDateConfirm),
-        aa: common_vendor.o(($event) => showEndDatePicker.value = false),
-        ab: common_vendor.o(($event) => showEndDatePicker.value = false),
-        ac: common_vendor.o(($event) => endDateValue.value = $event),
-        ad: common_vendor.p({
+        Z: common_vendor.t(formData.endDate || "请选择计划结束日期"),
+        aa: common_vendor.n(formData.endDate ? "picker-value" : "picker-placeholder"),
+        ab: common_vendor.o(openEndDatePicker),
+        ac: common_vendor.o(onEndDatePickerChange),
+        ad: common_vendor.o(onEndDateConfirm),
+        ae: common_vendor.o(($event) => showEndDatePicker.value = false),
+        af: common_vendor.o(($event) => showEndDatePicker.value = false),
+        ag: common_vendor.o(($event) => endDateValue.value = $event),
+        ah: common_vendor.p({
           show: showEndDatePicker.value,
           mode: "date",
           minDate: endDateMinDate.value,
+          filter: endDateFilter.value,
           modelValue: endDateValue.value
         }),
-        ae: common_vendor.t(checkItemCount.value),
-        af: checkItemCount.value === 0
+        ai: common_vendor.t(checkItemCount.value),
+        aj: checkItemCount.value === 0
       }, checkItemCount.value === 0 ? {} : {}, {
-        ag: common_vendor.f(manualCheckItems.value, (item, index, i0) => {
+        ak: common_vendor.f(manualCheckItems.value, (item, index, i0) => {
           return {
             a: common_vendor.t(index + 1),
             b: common_vendor.t(item.name),
@@ -799,7 +912,7 @@ const _sfc_main = {
             f: "manual-" + index
           };
         }),
-        ah: common_vendor.f(libraryCheckItems.value, (item, index, i0) => {
+        al: common_vendor.f(libraryCheckItems.value, (item, index, i0) => {
           return {
             a: common_vendor.t(item.sourceLibraryName || "-"),
             b: common_vendor.t(item.name),
@@ -809,41 +922,41 @@ const _sfc_main = {
             f: "lib-" + item.pointId
           };
         }),
-        ai: common_vendor.o(($event) => showAddPopup.value = true),
-        aj: common_vendor.o(openLibraryPopup),
-        ak: common_vendor.o(handleSave),
-        al: common_vendor.o(($event) => showAddPopup.value = false),
-        am: common_vendor.o(($event) => checkForm.name = $event),
-        an: common_vendor.p({
+        am: common_vendor.o(($event) => showAddPopup.value = true),
+        an: common_vendor.o(openLibraryPopup),
+        ao: common_vendor.o(handleSave),
+        ap: common_vendor.o(($event) => showAddPopup.value = false),
+        aq: common_vendor.o(($event) => checkForm.name = $event),
+        ar: common_vendor.p({
           placeholder: "请输入检查名称",
           border: "surround",
           modelValue: checkForm.name
         }),
-        ao: common_vendor.o(($event) => checkForm.point = $event),
-        ap: common_vendor.p({
+        as: common_vendor.o(($event) => checkForm.point = $event),
+        at: common_vendor.p({
           placeholder: "请输入检查内容",
           height: 150,
           modelValue: checkForm.point
         }),
-        aq: common_vendor.t(checkForm.regulationName || "选择法规"),
-        ar: common_vendor.n(checkForm.regulationName ? "" : "text-gray"),
-        as: common_vendor.o(openLawPopup),
-        at: common_vendor.o(($event) => showAddPopup.value = false),
-        av: common_vendor.o(handleAddCheck),
-        aw: common_vendor.o(($event) => showAddPopup.value = false),
-        ax: common_vendor.p({
+        av: common_vendor.t(checkForm.regulationName || "选择法规"),
+        aw: common_vendor.n(checkForm.regulationName ? "" : "text-gray"),
+        ax: common_vendor.o(openLawPopup),
+        ay: common_vendor.o(($event) => showAddPopup.value = false),
+        az: common_vendor.o(handleAddCheck),
+        aA: common_vendor.o(($event) => showAddPopup.value = false),
+        aB: common_vendor.p({
           show: showAddPopup.value,
           mode: "center",
           round: "20"
         }),
-        ay: common_vendor.o(($event) => showLawPopup.value = false),
-        az: common_vendor.o(searchRegulation),
-        aA: lawKeyword.value,
-        aB: common_vendor.o(($event) => lawKeyword.value = $event.detail.value),
-        aC: common_vendor.o(searchRegulation),
-        aD: lawLoading.value && lawList.value.length === 0
+        aC: common_vendor.o(($event) => showLawPopup.value = false),
+        aD: common_vendor.o(searchRegulation),
+        aE: lawKeyword.value,
+        aF: common_vendor.o(($event) => lawKeyword.value = $event.detail.value),
+        aG: common_vendor.o(searchRegulation),
+        aH: lawLoading.value && lawList.value.length === 0
       }, lawLoading.value && lawList.value.length === 0 ? {} : !lawLoading.value && lawList.value.length === 0 ? {} : common_vendor.e({
-        aF: common_vendor.f(lawList.value, (item, k0, i0) => {
+        aJ: common_vendor.f(lawList.value, (item, k0, i0) => {
           return {
             a: common_vendor.t(item.depict),
             b: common_vendor.t(item.legalBasis),
@@ -852,26 +965,26 @@ const _sfc_main = {
             e: common_vendor.o(($event) => selectLaw(item), item.id)
           };
         }),
-        aG: lawLoading.value
+        aK: lawLoading.value
       }, lawLoading.value ? {} : {}), {
-        aE: !lawLoading.value && lawList.value.length === 0,
-        aH: common_vendor.o(loadMoreLaw),
-        aI: common_vendor.o(($event) => showLawPopup.value = false),
-        aJ: common_vendor.o(confirmLaw),
-        aK: common_vendor.o(($event) => showLawPopup.value = false),
-        aL: common_vendor.p({
+        aI: !lawLoading.value && lawList.value.length === 0,
+        aL: common_vendor.o(loadMoreLaw),
+        aM: common_vendor.o(($event) => showLawPopup.value = false),
+        aN: common_vendor.o(confirmLaw),
+        aO: common_vendor.o(($event) => showLawPopup.value = false),
+        aP: common_vendor.p({
           show: showLawPopup.value,
           mode: "center",
           round: "20"
         }),
-        aM: common_vendor.o(closeLibraryPopup),
-        aN: common_vendor.o(searchLibrary),
-        aO: libraryKeyword.value,
-        aP: common_vendor.o(($event) => libraryKeyword.value = $event.detail.value),
-        aQ: common_vendor.o(searchLibrary),
-        aR: libraryLoading.value && libraryList.value.length === 0
+        aQ: common_vendor.o(closeLibraryPopup),
+        aR: common_vendor.o(searchLibrary),
+        aS: libraryKeyword.value,
+        aT: common_vendor.o(($event) => libraryKeyword.value = $event.detail.value),
+        aU: common_vendor.o(searchLibrary),
+        aV: libraryLoading.value && libraryList.value.length === 0
       }, libraryLoading.value && libraryList.value.length === 0 ? {} : !libraryLoading.value && libraryList.value.length === 0 ? {} : common_vendor.e({
-        aT: common_vendor.f(libraryList.value, (item, k0, i0) => {
+        aX: common_vendor.f(libraryList.value, (item, k0, i0) => {
           return common_vendor.e({
             a: selectedLibraries.value.includes(item.id)
           }, selectedLibraries.value.includes(item.id) ? {} : {}, {
@@ -882,40 +995,40 @@ const _sfc_main = {
             f: common_vendor.o(($event) => toggleLibrarySelect(item), item.id)
           });
         }),
-        aU: libraryLoading.value
+        aY: libraryLoading.value
       }, libraryLoading.value ? {} : {}), {
-        aS: !libraryLoading.value && libraryList.value.length === 0,
-        aV: common_vendor.o(loadMoreLibrary),
-        aW: common_vendor.o(addSelectedLibrary),
-        aX: common_vendor.o(closeLibraryPopup),
-        aY: common_vendor.p({
+        aW: !libraryLoading.value && libraryList.value.length === 0,
+        aZ: common_vendor.o(loadMoreLibrary),
+        ba: common_vendor.o(addSelectedLibrary),
+        bb: common_vendor.o(closeLibraryPopup),
+        bc: common_vendor.p({
           show: showLibraryPopup.value,
           mode: "center",
           round: "20"
         }),
-        aZ: common_vendor.o(($event) => showExecutorPopup.value = false),
-        ba: executorList.value.length === 0
+        bd: common_vendor.o(($event) => showExecutorPopup.value = false),
+        be: executorList.value.length === 0
       }, executorList.value.length === 0 ? {} : {
-        bb: common_vendor.f(executorList.value, (item, k0, i0) => {
+        bf: common_vendor.f(executorList.value, (item, k0, i0) => {
           return common_vendor.e({
-            a: selectedExecutorIds.value.includes(item.userId)
-          }, selectedExecutorIds.value.includes(item.userId) ? {} : {}, {
-            b: selectedExecutorIds.value.includes(item.userId) ? 1 : "",
+            a: selectedExecutorId.value === item.userId
+          }, selectedExecutorId.value === item.userId ? {} : {}, {
+            b: selectedExecutorId.value === item.userId ? 1 : "",
             c: common_vendor.t(item.nickName),
             d: item.userId,
-            e: common_vendor.o(($event) => toggleExecutorSelect(item), item.userId)
+            e: common_vendor.o(($event) => selectExecutor(item), item.userId)
           });
         })
       }, {
-        bc: common_vendor.o(($event) => showExecutorPopup.value = false),
-        bd: common_vendor.o(confirmExecutorSelect),
-        be: common_vendor.o(($event) => showExecutorPopup.value = false),
-        bf: common_vendor.p({
+        bg: common_vendor.o(($event) => showExecutorPopup.value = false),
+        bh: common_vendor.o(confirmExecutorSelect),
+        bi: common_vendor.o(($event) => showExecutorPopup.value = false),
+        bj: common_vendor.p({
           show: showExecutorPopup.value,
           mode: "center",
           round: "20"
         }),
-        bg: common_vendor.gei(_ctx, "")
+        bk: common_vendor.gei(_ctx, "")
       });
     };
   }

unpackage/dist/dev/mp-weixin/pages/editchecklist/editchecklist.wxss

@@ -83,6 +83,26 @@
   align-items: center;
   gap: 30rpx;
 }
+.weekend-options.data-v-98282eb3 {
+  display: flex;
+  gap: 20rpx;
+}
+.weekend-option.data-v-98282eb3 {
+  flex: 1;
+  height: 72rpx;
+  line-height: 72rpx;
+  text-align: center;
+  font-size: 28rpx;
+  color: #666;
+  background: #fff;
+  border: 2rpx solid #E5E5E5;
+  border-radius: 8rpx;
+}
+.weekend-option.active.data-v-98282eb3 {
+  color: #2667E9;
+  border-color: #2667E9;
+  background: #F0F6FF;
+}
 .empty-check-tip.data-v-98282eb3 {
   text-align: center;
   padding: 60rpx 0;
@@ -432,21 +452,25 @@
   padding: 24rpx;
   border-bottom: 1rpx solid #f0f0f0;
 }
-.executor-checkbox.data-v-98282eb3 {
+.executor-radio.data-v-98282eb3 {
   width: 40rpx;
   height: 40rpx;
   border: 2rpx solid #ccc;
-  border-radius: 8rpx;
+  border-radius: 50%;
   margin-right: 20rpx;
   display: flex;
   align-items: center;
   justify-content: center;
   flex-shrink: 0;
 }
-.executor-checkbox-active.data-v-98282eb3 {
-  background: #2667E9;
+.executor-radio-active.data-v-98282eb3 {
   border-color: #2667E9;
-  color: #fff;
+}
+.executor-radio-dot.data-v-98282eb3 {
+  width: 20rpx;
+  height: 20rpx;
+  border-radius: 50%;
+  background: #2667E9;
 }
 .executor-info.data-v-98282eb3 {
   flex: 1;