From ec76d588e212eecbad6065b1ad7482215631b16a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=88=A9=E5=BC=BA?= <18394468624@163.com> Date: Mon, 3 Aug 2026 11:51:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E8=A1=A8=E6=89=8B=E5=8A=A8?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A3=80=E6=9F=A5=E9=A1=B9=E6=97=B6=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E9=83=A8=E9=97=A8=E7=B1=BB=E5=9E=8B=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E4=B8=8D=E4=B8=80=E6=A0=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/checklist/detail.vue | 14 +- pages/editchecklist/editchecklist.vue | 295 +++++++++-- pages/hiddendanger/Inspection.vue | 39 +- pages/index/index.vue | 12 +- request/request.js | 6 +- .../uview-plus/components/u-popup/u-popup.vue | 1 - .../xq-tree/components/xq-tree/xq-tree.vue | 140 ++--- .../build/mp-weixin/pages/checklist/detail.js | 2 +- .../mp-weixin/pages/checklist/detail.wxml | 2 +- .../mp-weixin/pages/checklist/detail.wxss | 2 +- .../pages/editchecklist/editchecklist.js | 2 +- .../pages/editchecklist/editchecklist.wxml | 2 +- .../pages/editchecklist/editchecklist.wxss | 2 +- .../pages/hiddendanger/Inspection.js | 2 +- .../pages/hiddendanger/Inspection.wxml | 2 +- .../pages/hiddendanger/Inspection.wxss | 2 +- .../dist/build/mp-weixin/pages/index/index.js | 2 +- .../build/mp-weixin/pages/index/index.wxml | 2 +- .../build/mp-weixin/pages/index/index.wxss | 2 +- .../uview-plus/components/u-popup/u-popup.js | 2 +- .../components/u-popup/u-popup.wxml | 2 +- .../components/u-popup/u-popup.wxss | 2 +- .../xq-tree/components/xq-tree/xq-tree.js | 2 +- .../xq-tree/components/xq-tree/xq-tree.wxml | 2 +- .../xq-tree/components/xq-tree/xq-tree.wxss | 2 +- .../dist/build/mp-weixin/utils/userInfo.js | 2 +- .../mp-weixin/pages/checklist/detail.js.map | 2 +- .../pages/editchecklist/editchecklist.js.map | 2 +- .../pages/hiddendanger/Inspection.js.map | 2 +- .../mp-weixin/pages/index/index.js.map | 2 +- .../mp-weixin/request/request.js.map | 2 +- .../components/u-popup/u-popup.js.map | 2 +- .../xq-tree/components/xq-tree/xq-tree.js.map | 2 +- .../mp-weixin/utils/userInfo.js.map | 2 +- unpackage/dist/dev/mp-weixin/common/vendor.js | 2 +- .../dev/mp-weixin/pages/checklist/detail.js | 16 +- .../pages/editchecklist/editchecklist.js | 493 ++++++++++++------ .../pages/editchecklist/editchecklist.wxml | 2 +- .../pages/editchecklist/editchecklist.wxss | 17 + .../pages/hiddendanger/Inspection.js | 26 +- .../pages/hiddendanger/Inspection.wxml | 2 +- .../dist/dev/mp-weixin/pages/index/index.js | 8 +- .../dist/dev/mp-weixin/request/request.js | 2 +- .../uview-plus/components/u-popup/u-popup.js | 15 +- .../components/u-popup/u-popup.wxml | 2 +- .../xq-tree/components/xq-tree/xq-tree.js | 19 +- .../xq-tree/components/xq-tree/xq-tree.wxml | 2 +- .../xq-tree/components/xq-tree/xq-tree.wxss | 71 +-- .../dist/dev/mp-weixin/utils/userInfo.js | 9 +- utils/userInfo.js | 7 + 50 files changed, 826 insertions(+), 428 deletions(-) diff --git a/pages/checklist/detail.vue b/pages/checklist/detail.vue index ed5c940..59b1ee4 100644 --- a/pages/checklist/detail.vue +++ b/pages/checklist/detail.vue @@ -104,7 +104,7 @@ const checkItems = ref([]) const typeMap = { 1: '日常检查', 2: '专项检查', 3: '设备检查' } const cycleMap = { 1: '每天一次', 2: '每周', 3: '每月', 4: '每季度' } -const runModeMap = { 1: '单人完成', 2: '全员', 3: '指定分组' } +const runModeMap = { 1: '单人完成', 2: '全员', 3: '指定分组', 4: '排班模式' } const weekendMap = { 1: '包含周末', 2: '不包含周末' } const typeLabel = computed(() => detail.value.typeName || typeMap[detail.value.type] || '-') @@ -112,8 +112,16 @@ const cycleLabel = computed(() => detail.value.cycleName || cycleMap[detail.valu const runModeLabel = computed(() => detail.value.runModeName || runModeMap[detail.value.runMode] || '-') const weekendLabel = computed(() => detail.value.isWeekendName || weekendMap[detail.value.isWeekend] || '-') const executorLabel = computed(() => { - if (Number(detail.value.runMode) === 2) return '全员' - return detail.value.executorName || '-' + const runMode = Number(detail.value.runMode) + if (runMode === 2) return '全员' + if (runMode === 4) { + const rosterItems = detail.value.rosterItems || [] + if (rosterItems.length > 0) { + return rosterItems.map((item) => item.identityName).filter(Boolean).join('、') || '-' + } + return '-' + } + return detail.value.executorIdentityName || detail.value.executorName || '-' }) const formatDate = (value) => { diff --git a/pages/editchecklist/editchecklist.vue b/pages/editchecklist/editchecklist.vue index 5a9de86..5f00e2f 100644 --- a/pages/editchecklist/editchecklist.vue +++ b/pages/editchecklist/editchecklist.vue @@ -1,4 +1,5 @@