From e44fd8936a390c2860aafc8149be30aaf0ffaa22 Mon Sep 17 00:00:00 2001 From: “wangming” <“wangming@antissoft.com”> Date: Sat, 11 Apr 2026 08:02:52 +0800 Subject: [PATCH] feat: update project configuration and enhance salary calculation logic --- member-miniapp/unpackage/dist/dev/mp-weixin/project.config.json | 30 ++++++++++++++++++++++++++---- member-miniapp/unpackage/dist/dev/mp-weixin/project.private.config.json | 22 ++++++++++++++++++++++ netcore/src/Modularity/Extend/NCC.Extend/LqAssistantSalaryService.cs | 3 ++- netcore/src/Modularity/Extend/NCC.Extend/LqDirectorSalaryService.cs | 4 +++- netcore/src/Modularity/Extend/NCC.Extend/LqMajorProjectDirectorSalaryService.cs | 3 ++- netcore/src/Modularity/Extend/NCC.Extend/LqSalaryExtraCalculationService.cs | 3 ++- netcore/src/Modularity/Extend/NCC.Extend/LqSalaryService.cs | 7 ++++--- netcore/src/Modularity/Extend/NCC.Extend/LqStoreManagerSalaryService.cs | 3 ++- netcore/src/Modularity/Extend/NCC.Extend/LqTechGeneralManagerSalaryService.cs | 3 ++- netcore/src/Modularity/Extend/NCC.Extend/LqTechTeacherSalaryService.cs | 3 ++- 绿纤uni-app/common/config.js | 4 ++-- 绿纤uni-app/unpackage/dist/dev/mp-weixin/pages/attendance-punch/attendance-punch.js | 2 +- 绿纤uni-app/unpackage/dist/dev/mp-weixin/pages/laundry-flow-send/laundry-flow-send.js | 4 +++- 绿纤uni-app/unpackage/dist/dev/mp-weixin/pages/login/login.wxss | 8 ++++++++ 绿纤uni-app/unpackage/dist/dev/mp-weixin/pages/member-create/member-create.js | 2 +- 绿纤uni-app/unpackage/dist/dev/mp-weixin/pages/member-edit/member-edit.js | 2 +- 绿纤uni-app/unpackage/dist/dev/mp-weixin/pagesA/lx/lx.js | 3 +++ 绿纤uni-app/unpackage/dist/dev/mp-weixin/pagesA/member-consume/member-consume.js | 2 ++ 绿纤uni-app/unpackage/dist/dev/mp-weixin/pagesA/reimbursement-detail/reimbursement-detail.js | 6 ++++-- 绿纤uni-app/unpackage/dist/dev/mp-weixin/pagesA/reimbursement-form/reimbursement-form.js | 33 ++++++++++++++++++++------------- 20 files changed, 112 insertions(+), 35 deletions(-) create mode 100644 member-miniapp/unpackage/dist/dev/mp-weixin/project.private.config.json diff --git a/member-miniapp/unpackage/dist/dev/mp-weixin/project.config.json b/member-miniapp/unpackage/dist/dev/mp-weixin/project.config.json index a9ca89b..c6d0a0a 100644 --- a/member-miniapp/unpackage/dist/dev/mp-weixin/project.config.json +++ b/member-miniapp/unpackage/dist/dev/mp-weixin/project.config.json @@ -1,7 +1,8 @@ { "description": "项目配置文件。", "packOptions": { - "ignore": [] + "ignore": [], + "include": [] }, "setting": { "urlCheck": false, @@ -9,11 +10,30 @@ "postcss": true, "minified": true, "newFeature": true, - "bigPackageSizeSupport": true + "bigPackageSizeSupport": true, + "compileWorklet": false, + "uglifyFileName": false, + "uploadWithSourceMap": true, + "enhance": false, + "packNpmManually": false, + "packNpmRelationList": [], + "minifyWXSS": true, + "minifyWXML": true, + "localPlugins": false, + "disableUseStrict": false, + "useCompilerPlugins": false, + "condition": false, + "swc": false, + "disableSWC": true, + "babelSetting": { + "ignore": [], + "disablePlugins": [], + "outputPath": "" + } }, "compileType": "miniprogram", "libVersion": "", - "appid": "touristappid", + "appid": "wx5f4fc45cc3bbf5f8", "projectname": "绿纤美业会员端", "condition": { "search": { @@ -32,5 +52,7 @@ "current": -1, "list": [] } - } + }, + "simulatorPluginLibVersion": {}, + "editorSetting": {} } \ No newline at end of file diff --git a/member-miniapp/unpackage/dist/dev/mp-weixin/project.private.config.json b/member-miniapp/unpackage/dist/dev/mp-weixin/project.private.config.json new file mode 100644 index 0000000..00fc4f5 --- /dev/null +++ b/member-miniapp/unpackage/dist/dev/mp-weixin/project.private.config.json @@ -0,0 +1,22 @@ +{ + "libVersion": "3.15.1", + "projectname": "mp-weixin", + "condition": {}, + "setting": { + "urlCheck": false, + "coverView": false, + "lazyloadPlaceholderEnable": false, + "skylineRenderEnable": false, + "preloadBackgroundData": false, + "autoAudits": false, + "useApiHook": true, + "showShadowRootInWxmlPanel": false, + "useStaticServer": false, + "useLanDebug": false, + "showES6CompileOption": false, + "compileHotReLoad": true, + "checkInvalidKey": true, + "ignoreDevUnusedFiles": true, + "bigPackageSizeSupport": true + } +} \ No newline at end of file diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqAssistantSalaryService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqAssistantSalaryService.cs index d151112..c16ea7c 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/LqAssistantSalaryService.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/LqAssistantSalaryService.cs @@ -211,7 +211,8 @@ namespace NCC.Extend var monthFactUserIdSet = (await LqMonthlyEmployeeFactHelper.GetUserIdsWithMonthBusinessFactsAsync(_db, year, month)) .ToHashSet(StringComparer.Ordinal); var assistantUserEntities = await _db.Queryable() - .Where(x => x.DeleteMark == null && (x.EnabledMark == 1 || monthFactUserIdSet.Contains(x.Id))) + .Where(x => x.DeleteMark == null && (x.EnabledMark == 1 || monthFactUserIdSet.Contains(x.Id) + || (x.EntryDate != null && x.EntryDate <= endDate && (x.LeaveDate == null || x.LeaveDate >= startDate)))) .Where(x => (x.Gw == "店助" || x.Gw == "店助主任") || extraIds.Contains(x.Id)) .ToListAsync(); await LqSalaryUserSnapshotHelper.ApplySalaryUserSnapshotsAsync(_db, assistantUserEntities, endDate); diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqDirectorSalaryService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqDirectorSalaryService.cs index b9ede3f..6b56532 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/LqDirectorSalaryService.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/LqDirectorSalaryService.cs @@ -266,8 +266,10 @@ namespace NCC.Extend var extraIds = await LqSalaryUserSnapshotHelper.GetSalaryCandidateUserIdsAsync(_db, startDate, endDate, year, month); var monthFactUserIdSet = (await LqMonthlyEmployeeFactHelper.GetUserIdsWithMonthBusinessFactsAsync(_db, year, month)) .ToHashSet(StringComparer.Ordinal); + // 当月曾在职：入职不晚于月末且（未离职或离职不早于月初）；须内联日期条件，勿调用静态方法（SqlSugar 无法翻译） var directorUserEntities = await _db.Queryable() - .Where(x => x.DeleteMark == null && (x.EnabledMark == 1 || monthFactUserIdSet.Contains(x.Id))) + .Where(x => x.DeleteMark == null && (x.EnabledMark == 1 || monthFactUserIdSet.Contains(x.Id) + || (x.EntryDate != null && x.EntryDate <= endDate && (x.LeaveDate == null || x.LeaveDate >= startDate)))) .Where(x => x.Gw == "主任" || extraIds.Contains(x.Id)) .ToListAsync(); await LqSalaryUserSnapshotHelper.ApplySalaryUserSnapshotsAsync(_db, directorUserEntities, endDate); diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqMajorProjectDirectorSalaryService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqMajorProjectDirectorSalaryService.cs index 6a8a1f9..68062a4 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/LqMajorProjectDirectorSalaryService.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/LqMajorProjectDirectorSalaryService.cs @@ -231,7 +231,8 @@ namespace NCC.Extend var monthFactUserIdSet = (await LqMonthlyEmployeeFactHelper.GetUserIdsWithMonthBusinessFactsAsync(_db, year, month)) .ToHashSet(StringComparer.Ordinal); var directorEntities = await _db.Queryable() - .Where(x => x.DeleteMark == null && (x.EnabledMark == 1 || monthFactUserIdSet.Contains(x.Id))) + .Where(x => x.DeleteMark == null && (x.EnabledMark == 1 || monthFactUserIdSet.Contains(x.Id) + || (x.EntryDate != null && x.EntryDate <= endDate && (x.LeaveDate == null || x.LeaveDate >= startDate)))) .Where(x => (x.Gw == "主管" && majorProjectOrganizeIds.Contains(x.OrganizeId)) || extraIds.Contains(x.Id)) diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqSalaryExtraCalculationService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqSalaryExtraCalculationService.cs index a998da7..e0063ac 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/LqSalaryExtraCalculationService.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/LqSalaryExtraCalculationService.cs @@ -565,7 +565,8 @@ namespace NCC.Extend // 健康师的岗位字段是F_GW，值为"健康师" var healthCoaches = await _db.Queryable() .Where(u => newStoreIds.Contains(u.Mdid) && u.Gw == "健康师" && (u.DeleteMark == null || u.DeleteMark == 0) - && (u.EnabledMark == 1 || monthFactUserIdSet.Contains(u.Id))) + && (u.EnabledMark == 1 || monthFactUserIdSet.Contains(u.Id) + || (u.EntryDate != null && u.EntryDate <= endDate && (u.LeaveDate == null || u.LeaveDate >= startDate)))) .Select(u => new { u.Id, u.RealName, u.Mdid }) .ToListAsync(); diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqSalaryService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqSalaryService.cs index a2eb2a7..ee763d5 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/LqSalaryService.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/LqSalaryService.cs @@ -468,7 +468,8 @@ namespace NCC.Extend .ToHashSet(StringComparer.Ordinal); var userEntities = await _db.Queryable() .Where(x => candidateIds.Contains(x.Id) && x.DeleteMark == null - && (x.EnabledMark == 1 || monthFactUserIdSet.Contains(x.Id))) + && (x.EnabledMark == 1 || monthFactUserIdSet.Contains(x.Id) + || (x.EntryDate != null && x.EntryDate <= endDate && (x.LeaveDate == null || x.LeaveDate >= startDate)))) .ToListAsync(); await LqSalaryUserSnapshotHelper.ApplySalaryUserSnapshotsAsync(_db, userEntities, endDate); var userList = userEntities @@ -485,8 +486,8 @@ namespace NCC.Extend var positionList = await _db.Queryable().Where(x => positionIds.Contains(x.Id)).ToListAsync(); var positionLookup = positionList.Where(x => !string.IsNullOrEmpty(x.Id)).ToDictionary(x => x.Id, x => x.FullName); - // 只处理健康师员工 - foreach (var empId in allEmployeeIds.Where(x => healthCoachIds.Contains(x))) + // 只处理健康师：含仅有当月考勤/切段、无业绩消耗战队的候选人（与 candidateIds 扩大口径一致） + foreach (var empId in healthCoachIds.Distinct()) { var salary = new LqSalaryStatisticsEntity { diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqStoreManagerSalaryService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqStoreManagerSalaryService.cs index b41689b..cd3413c 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/LqStoreManagerSalaryService.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/LqStoreManagerSalaryService.cs @@ -223,7 +223,8 @@ namespace NCC.Extend var monthFactUserIdSet = (await LqMonthlyEmployeeFactHelper.GetUserIdsWithMonthBusinessFactsAsync(_db, year, month)) .ToHashSet(StringComparer.Ordinal); var storeManagerUserEntities = await _db.Queryable() - .Where(x => x.DeleteMark == null && (x.EnabledMark == 1 || monthFactUserIdSet.Contains(x.Id))) + .Where(x => x.DeleteMark == null && (x.EnabledMark == 1 || monthFactUserIdSet.Contains(x.Id) + || (x.EntryDate != null && x.EntryDate <= endDate && (x.LeaveDate == null || x.LeaveDate >= startDate)))) .Where(x => x.Gw == "店长" || extraIds.Contains(x.Id)) .ToListAsync(); await LqSalaryUserSnapshotHelper.ApplySalaryUserSnapshotsAsync(_db, storeManagerUserEntities, endDate); diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqTechGeneralManagerSalaryService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqTechGeneralManagerSalaryService.cs index b446154..f5f0c2a 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/LqTechGeneralManagerSalaryService.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/LqTechGeneralManagerSalaryService.cs @@ -262,7 +262,8 @@ namespace NCC.Extend var monthFactUserIdSet = (await LqMonthlyEmployeeFactHelper.GetUserIdsWithMonthBusinessFactsAsync(_db, year, month)) .ToHashSet(StringComparer.Ordinal); var gmEntities = await _db.Queryable() - .Where(x => x.DeleteMark == null && (x.EnabledMark == 1 || monthFactUserIdSet.Contains(x.Id))) + .Where(x => x.DeleteMark == null && (x.EnabledMark == 1 || monthFactUserIdSet.Contains(x.Id) + || (x.EntryDate != null && x.EntryDate <= endDate && (x.LeaveDate == null || x.LeaveDate >= startDate)))) .Where(x => ((x.Gw == "总经理" || x.Gw == "科技部总经理") && techOrganizeIds.Contains(x.OrganizeId)) || extraIds.Contains(x.Id)) diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqTechTeacherSalaryService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqTechTeacherSalaryService.cs index dd121d1..df0ec02 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/LqTechTeacherSalaryService.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/LqTechTeacherSalaryService.cs @@ -253,7 +253,8 @@ namespace NCC.Extend var monthFactUserIdSet = (await LqMonthlyEmployeeFactHelper.GetUserIdsWithMonthBusinessFactsAsync(_db, year, month)) .ToHashSet(StringComparer.Ordinal); var techTeacherUserEntities = await _db.Queryable() - .Where(x => x.DeleteMark == null && (x.EnabledMark == 1 || monthFactUserIdSet.Contains(x.Id))) + .Where(x => x.DeleteMark == null && (x.EnabledMark == 1 || monthFactUserIdSet.Contains(x.Id) + || (x.EntryDate != null && x.EntryDate <= endDate && (x.LeaveDate == null || x.LeaveDate >= startDate)))) .Where(x => x.Gw == "科技老师" || extraIds.Contains(x.Id)) .ToListAsync(); await LqSalaryUserSnapshotHelper.ApplySalaryUserSnapshotsAsync(_db, techTeacherUserEntities, endDate); diff --git a/绿纤uni-app/common/config.js b/绿纤uni-app/common/config.js index 2dfa06b..e470647 100644 --- a/绿纤uni-app/common/config.js +++ b/绿纤uni-app/common/config.js @@ -12,8 +12,8 @@ const ENV_CONFIG = { production: { name: '正式环境', // apiBaseUrl: 'http://erp_test.lvqianmeiye.com', - // apiBaseUrl: 'http://localhost:2015', - apiBaseUrl: 'https://erp.lvqianmeiye.com', + apiBaseUrl: 'http://localhost:2015', + // apiBaseUrl: 'https://erp.lvqianmeiye.com', // apiBaseUrl: 'http://lvqian.antissoft.com', description: '生产环境服务器' } diff --git a/绿纤uni-app/unpackage/dist/dev/mp-weixin/pages/attendance-punch/attendance-punch.js b/绿纤uni-app/unpackage/dist/dev/mp-weixin/pages/attendance-punch/attendance-punch.js index bfeeaee..f2b5dfb 100644 --- a/绿纤uni-app/unpackage/dist/dev/mp-weixin/pages/attendance-punch/attendance-punch.js +++ b/绿纤uni-app/unpackage/dist/dev/mp-weixin/pages/attendance-punch/attendance-punch.js @@ -469,7 +469,7 @@ var _default = { if (!rf && !rw) return '当前门店未要求范围或 Wi-Fi，正常打卡可直接进行'; var fenceLine = rf ? this.longitude == null || this.latitude == null ? '需定位后判断是否在打卡范围内' : this.isInFence === true ? '已在打卡范围内' : '不在打卡范围内' : ''; var hasPairs = this.wifiPairRulesCount > 0; - var wifiLine = rw ? !hasPairs ? '门店已要求 Wi-Fi 打卡，但未配置网络白名单，请联系管理员在门店资料中维护' : this.wifiMatchesStore ? '已匹配门店 Wi-Fi 规则' : '未匹配门店 Wi-Fi 规则（开启「对应」且无 BSSID 时需同时在围栏内且 SSID 正确）' : ''; + var wifiLine = rw ? !hasPairs ? '门店已要求 Wi-Fi 打卡，但未配置网络白名单，请联系管理员在门店资料中维护' : this.wifiMatchesStore ? '已匹配门店 Wi-Fi 规则' : '未匹配门店 Wi-Fi 规则（严格：有 BSSID 仅校验路由器；无 BSSID 且已配围栏需在范围内且 SSID 正确；未配围栏时仅校验 SSID）' : ''; if (rf && rw) { return "\u95E8\u5E97\u8981\u6C42\uFF1A\u8303\u56F4\u6216 Wi-Fi \u6EE1\u8DB3\u5176\u4E00\u5373\u53EF\u3002".concat(fenceLine, "\uFF1B").concat(wifiLine); } diff --git a/绿纤uni-app/unpackage/dist/dev/mp-weixin/pages/laundry-flow-send/laundry-flow-send.js b/绿纤uni-app/unpackage/dist/dev/mp-weixin/pages/laundry-flow-send/laundry-flow-send.js index 6615ddf..75aef20 100644 --- a/绿纤uni-app/unpackage/dist/dev/mp-weixin/pages/laundry-flow-send/laundry-flow-send.js +++ b/绿纤uni-app/unpackage/dist/dev/mp-weixin/pages/laundry-flow-send/laundry-flow-send.js @@ -224,7 +224,9 @@ var _default = { showDateTimePicker: false, currentDateTimeValue: 0, // 当前正在编辑时间的记录下标 - currentTimeIndex: -1 + currentTimeIndex: -1, + // 当前正在编辑的记录下标（用于选择弹窗回填） + currentRecordIndex: -1 }; }, onLoad: function onLoad() { diff --git a/绿纤uni-app/unpackage/dist/dev/mp-weixin/pages/login/login.wxss b/绿纤uni-app/unpackage/dist/dev/mp-weixin/pages/login/login.wxss index aab58d9..6af1b65 100644 --- a/绿纤uni-app/unpackage/dist/dev/mp-weixin/pages/login/login.wxss +++ b/绿纤uni-app/unpackage/dist/dev/mp-weixin/pages/login/login.wxss @@ -147,6 +147,14 @@ color: #1f2937; background: transparent; border: none; + outline: none; + -webkit-appearance: none; + appearance: none; +} +.lp-input.data-v-b237504c:focus { + border: none; + outline: none; + box-shadow: none; } .lp-placeholder.data-v-b237504c { color: #9ca3af; diff --git a/绿纤uni-app/unpackage/dist/dev/mp-weixin/pages/member-create/member-create.js b/绿纤uni-app/unpackage/dist/dev/mp-weixin/pages/member-create/member-create.js index 7f0759c..5a0d2b7 100644 --- a/绿纤uni-app/unpackage/dist/dev/mp-weixin/pages/member-create/member-create.js +++ b/绿纤uni-app/unpackage/dist/dev/mp-weixin/pages/member-create/member-create.js @@ -173,7 +173,7 @@ var _default = { // 选项数据 memberTypeOptions: ['老客', '新客'], memberTypeIndex: 0, - memberSourceOptions: ['自然到店', '嘉宾', '售后', '直播间', '转店顾客', '美团', '联联', '三方拓客', '其他', '补录'], + memberSourceOptions: ['自然到店', '嘉宾', '售后', '直播间', '转店顾客', '美团', '联联', '三方拓客', '其他', '补录', '抖音'], memberSourceIndex: 0, // 推荐人相关 showReferrerGroup: false, diff --git a/绿纤uni-app/unpackage/dist/dev/mp-weixin/pages/member-edit/member-edit.js b/绿纤uni-app/unpackage/dist/dev/mp-weixin/pages/member-edit/member-edit.js index fbd7845..e64fdf2 100644 --- a/绿纤uni-app/unpackage/dist/dev/mp-weixin/pages/member-edit/member-edit.js +++ b/绿纤uni-app/unpackage/dist/dev/mp-weixin/pages/member-edit/member-edit.js @@ -195,7 +195,7 @@ var _default = { genderIndex: null, memberTypeOptions: ['老客', '新客'], memberTypeIndex: 0, - memberSourceOptions: ['19.9卡', '自然到店', '嘉宾', '售后', '直播间', '转店顾客', '美团', '联联', '三方拓客', '其他', '补录'], + memberSourceOptions: ['19.9卡', '自然到店', '嘉宾', '售后', '直播间', '转店顾客', '美团', '联联', '三方拓客', '其他', '补录', '抖音'], memberSourceIndex: 1, // 默认选择"自然到店" diff --git a/绿纤uni-app/unpackage/dist/dev/mp-weixin/pagesA/lx/lx.js b/绿纤uni-app/unpackage/dist/dev/mp-weixin/pagesA/lx/lx.js index 2305189..d3c017e 100644 --- a/绿纤uni-app/unpackage/dist/dev/mp-weixin/pagesA/lx/lx.js +++ b/绿纤uni-app/unpackage/dist/dev/mp-weixin/pagesA/lx/lx.js @@ -354,6 +354,9 @@ var _default = { }, { text: '合作方退', value: '合作方退' + }, { + text: '抖音', + value: '抖音' }], sfskddOptions: [{ text: '是', diff --git a/绿纤uni-app/unpackage/dist/dev/mp-weixin/pagesA/member-consume/member-consume.js b/绿纤uni-app/unpackage/dist/dev/mp-weixin/pagesA/member-consume/member-consume.js index d901eb8..c7e8f84 100644 --- a/绿纤uni-app/unpackage/dist/dev/mp-weixin/pagesA/member-consume/member-consume.js +++ b/绿纤uni-app/unpackage/dist/dev/mp-weixin/pagesA/member-consume/member-consume.js @@ -907,6 +907,8 @@ var _default = { this.formData.hyzh = selectedOption.value; this.formData.hymc = selectedOption.label; this.formData.gklx = selectedOption.khlx || ''; + this.pxList = []; + this.addPxRow(); } } this.closeModal(); diff --git a/绿纤uni-app/unpackage/dist/dev/mp-weixin/pagesA/reimbursement-detail/reimbursement-detail.js b/绿纤uni-app/unpackage/dist/dev/mp-weixin/pagesA/reimbursement-detail/reimbursement-detail.js index 1f162a9..5584a06 100644 --- a/绿纤uni-app/unpackage/dist/dev/mp-weixin/pagesA/reimbursement-detail/reimbursement-detail.js +++ b/绿纤uni-app/unpackage/dist/dev/mp-weixin/pagesA/reimbursement-detail/reimbursement-detail.js @@ -925,16 +925,18 @@ var _default = { }); return; } + console.error(file, attachmentList); var fullUrl = file.url.startsWith('http') ? file.url : "".concat(this.baseUrl).concat(file.url); // 判断文件类型 - var fileExtension = this.getFileExtension(file.name || file.url); + var fileExtension = this.getFileExtension(file.fileId || file.url); + console.error(fileExtension); var imageExtensions = ['jpg', 'jpeg', 'png', 'gif', 'bmp', 'webp']; if (imageExtensions.includes(fileExtension.toLowerCase())) { // 图片类型：预览 // 构建所有图片URL列表 var imageUrls = attachmentList.filter(function (item) { - var ext = _this6.getFileExtension(item.name || item.url); + var ext = _this6.getFileExtension(item.fileId || item.url); return imageExtensions.includes(ext.toLowerCase()); }).map(function (item) { var url = item.url.startsWith('http') ? item.url : "".concat(_this6.baseUrl).concat(item.url); diff --git a/绿纤uni-app/unpackage/dist/dev/mp-weixin/pagesA/reimbursement-form/reimbursement-form.js b/绿纤uni-app/unpackage/dist/dev/mp-weixin/pagesA/reimbursement-form/reimbursement-form.js index e08a1ce..e47932d 100644 --- a/绿纤uni-app/unpackage/dist/dev/mp-weixin/pagesA/reimbursement-form/reimbursement-form.js +++ b/绿纤uni-app/unpackage/dist/dev/mp-weixin/pagesA/reimbursement-form/reimbursement-form.js @@ -1419,17 +1419,24 @@ var _default = { params = { currentPage: _this11.purchaseQuery.currentPage, pageSize: _this11.purchaseQuery.pageSize, - approveStatus: '未审批', - // 只选择未审批的购买记录 + approveStatus: '未审批' // 只选择未审批的购买记录 // createUserStoreId: this.formData.applicationStoreId || '暂无', - createUser: _this11.newuserInfo && _this11.newuserInfo.id ? _this11.newuserInfo.id : '暂无' + // createUser:this.newuserInfo&&this.newuserInfo.id?this.newuserInfo.id:'暂无', }; + + if (_this11.newuserInfo.gw == '店助' || _this11.newuserInfo.gw == '店长') { + params.createUserStoreId = _this11.newuserInfo && _this11.newuserInfo.mdid ? _this11.newuserInfo.mdid : '暂无'; + } else { + if (_this11.userInfo && _this11.userInfo.userId) { + params.createUser = _this11.newuserInfo && _this11.newuserInfo.id ? _this11.newuserInfo.id : '暂无'; + } + } if (_this11.searchKeyword) { params.reimbursementCategoryName = _this11.searchKeyword; } - _context10.next = 6; + _context10.next = 7; return _purchase.default.getPurchaseList(params); - case 6: + case 7: res = _context10.sent; if (res.code === 200 && res.data) { newList = res.data.list || []; @@ -1450,10 +1457,10 @@ var _default = { } _this11.purchaseTotal = 0; } - _context10.next = 16; + _context10.next = 17; break; - case 10: - _context10.prev = 10; + case 11: + _context10.prev = 11; _context10.t0 = _context10["catch"](0); console.error('加载购买记录失败:', _context10.t0); uni.showToast({ @@ -1465,16 +1472,16 @@ var _default = { _this11.filteredPurchaseList = []; } _this11.purchaseTotal = 0; - case 16: - _context10.prev = 16; + case 17: + _context10.prev = 17; _this11.purchaseListLoading = false; - return _context10.finish(16); - case 19: + return _context10.finish(17); + case 20: case "end": return _context10.stop(); } } - }, _callee10, null, [[0, 10, 16, 19]]); + }, _callee10, null, [[0, 11, 17, 20]]); }))(); }, // 加载更多购买记录 -- libgit2 0.21.4