123

huimv-employment/app/api/notification.js

@@ -1,4 +1,4 @@
-import { get } from '@/utils/request.js'
+import { get, post } from '@/utils/request.js'
 
 /**
  * 我的消息与待办
@@ -28,3 +28,13 @@ export function listMyNotifications(params = {}, options = {}) {
 	if (params.size != null) data.size = params.size
 	return get('/notifications', data, options)
 }
+
+/**
+ * 标记消息已读
+ * POST /api/v1/mp/notifications/{id}/read
+ * @param {number|string} id 消息 ID
+ * @returns {Promise<{ item?: object, unreadCount?: number, unread_count?: number }>}
+ */
+export function markNotificationRead(id, options = {}) {
+	return post(`/notifications/${id}/read`, {}, options)
+}

huimv-employment/app/common/config.js

@@ -1,6 +1,6 @@
 /** 小程序直连 API（体验版/开发版统一；有正式 HTTPS 域名后再改 env） */
-// const MP_API = 'http://192.168.1.6:8081/api/v1/mp'
-const MP_API = 'https://img.ifarmcloud.com/deploymentApi/api/v1/mp'
+const MP_API = 'http://192.168.1.6:8081/api/v1/mp'
+// const MP_API = 'https://img.ifarmcloud.com/deploymentApi/api/v1/mp'
 
 /** H5 开发走 devServer 代理，避免浏览器跨域 */
 const H5_DEV_PROXY_API = '/api/v1/mp'

huimv-employment/app/packageA/components/chat/FeRecruitSheet.vue

@@ -479,6 +479,7 @@ export default {
 	font-size: 26rpx;
 	font-weight: 700;
 	color: $fe-foreground;
+	line-height: 1.4;
 	word-break: break-all;
 }
 

huimv-employment/app/packageA/components/chat/FeSettlementSheet.vue

@@ -131,9 +131,8 @@
 <script>
 import { showToast } from '@/common/chat-data.js'
 import { getOrderSettlement, confirmPaySettlement, startSettlement } from '@/api/order.js'
-import { getDraftDetail } from '@/api/draft.js'
 import { mapSettlementSummary } from '@/utils/settlement.js'
-import { normalizeWorkerGroups, mapDraftDetailToCard } from '@/utils/draft.js'
+import { normalizeWorkerGroups } from '@/utils/draft.js'
 
 const EMPTY_VIEW = {
 	sourceTitle: '',
@@ -166,9 +165,7 @@ export default {
 			loading: false,
 			loadError: '',
 			paying: false,
-			view: Object.assign({}, EMPTY_VIEW),
-			draftGroups: [],
-			draftTitle: ''
+			view: Object.assign({}, EMPTY_VIEW)
 		}
 	},
 	computed: {
@@ -182,9 +179,6 @@ export default {
 		},
 		orderId() {
 			if (this.active) this.loadDetail()
-		},
-		draftId() {
-			if (this.active) this.loadDetail()
 		}
 	},
 	methods: {
@@ -192,18 +186,32 @@ export default {
 		onClose() {
 			this.$emit('close')
 		},
-		async loadDraftGroups() {
-			this.draftGroups = []
-			this.draftTitle = ''
-			if (this.draftId == null || this.draftId === '') return
+		hasWorkerGroups(raw) {
+			return normalizeWorkerGroups(raw || {}).length > 0
+		},
+		/** GET 详情才带 worker_groups；发起/支付响应若缺失则再拉一次 */
+		async fetchSettlementDetail() {
+			let raw = null
 			try {
-				const detail = await getDraftDetail(this.draftId, { showError: false })
-				const card = mapDraftDetailToCard(detail || {})
-				this.draftGroups = normalizeWorkerGroups(detail || {})
-				this.draftTitle = (card && card.title) || (detail && detail.title) || ''
+				raw = await getOrderSettlement(this.orderId, { showError: false })
 			} catch (e) {
-				this.draftGroups = []
+				if (this.readonly) throw e
+				try {
+					await startSettlement(this.orderId, { allowBeforeEndDate: false }, { showError: false })
+				} catch (e2) {
+					throw e
+				}
+				raw = await getOrderSettlement(this.orderId, { showError: false })
 			}
+			if (raw && !this.hasWorkerGroups(raw)) {
+				try {
+					const again = await getOrderSettlement(this.orderId, { showError: false })
+					if (again) raw = again
+				} catch (e3) {
+					// 保留已有 raw
+				}
+			}
+			return raw
 		},
 		async loadDetail() {
 			if (this.orderId == null || this.orderId === '') {
@@ -214,23 +222,8 @@ export default {
 			this.loading = true
 			this.loadError = ''
 			try {
-				await this.loadDraftGroups()
-				let raw = null
-				try {
-					raw = await getOrderSettlement(this.orderId, { showError: false })
-				} catch (e) {
-					// 只读查看不发起结算；否则尚无结算单时尝试发起（幂等）
-					if (this.readonly) throw e
-					try {
-						raw = await startSettlement(this.orderId, { allowBeforeEndDate: false }, { showError: false })
-					} catch (e2) {
-						throw e
-					}
-				}
-				this.view = mapSettlementSummary(raw || {}, {
-					workerGroups: this.draftGroups,
-					title: this.draftTitle
-				})
+				const raw = await this.fetchSettlementDetail()
+				this.view = mapSettlementSummary(raw || {})
 			} catch (e) {
 				this.view = Object.assign({}, EMPTY_VIEW)
 				this.loadError = (e && (e.msg || e.message)) || '结算单加载失败'
@@ -251,16 +244,21 @@ export default {
 			}
 			this.paying = true
 			try {
-				const raw = await confirmPaySettlement(
+				const payRaw = await confirmPaySettlement(
 					this.orderId,
 					{ paymentChannel: 'wechat' },
 					{ showError: true }
 				)
-				this.view = mapSettlementSummary(raw || {}, {
-					workerGroups: this.draftGroups,
-					title: this.draftTitle
-				})
-				showToast((raw && raw.message) || '支付完成')
+				let raw = payRaw
+				if (!this.hasWorkerGroups(raw)) {
+					try {
+						raw = await getOrderSettlement(this.orderId, { showError: false }) || payRaw
+					} catch (e) {
+						raw = payRaw
+					}
+				}
+				this.view = mapSettlementSummary(raw || {})
+				showToast((payRaw && payRaw.message) || '支付完成')
 				this.$emit('paid', {
 					orderId: this.orderId,
 					settlementId: this.view.settlementId,

huimv-employment/app/packageA/components/chat/FeTaskPublishSheet.vue

@@ -25,37 +25,29 @@
 						<text class="tp-hero__desc">{{ statusDesc }}</text>
 					</view>
 
-					<!-- 任务信息：按工种多组 -->
+					<!-- 任务信息：多工种逗号拼接，单卡展示 -->
 					<view class="tp-section">
 						<text class="tp-section__title">任务信息</text>
-						<view
-							v-for="(g, gi) in groups"
-							:key="g.rowKey"
-							class="tp-card"
-						>
-							<text v-if="groups.length > 1" class="tp-card__badge">工种 {{ gi + 1 }} · {{ g.workType }}</text>
+						<view class="tp-card">
 							<view class="tp-grid">
 								<view class="tp-grid__cell">
 									<text class="tp-grid__label">岗位类型</text>
-									<text class="tp-grid__value">{{ g.workType || '—' }}</text>
+									<text class="tp-grid__value">{{ taskInfoSummary.jobTypeText }}</text>
 								</view>
 								<view class="tp-grid__cell">
 									<text class="tp-grid__label">用工人数</text>
-									<text class="tp-grid__value">{{ g.workerCountText }}</text>
+									<text class="tp-grid__value">{{ taskInfoSummary.workerCountText }}</text>
 								</view>
 								<view class="tp-grid__cell">
 									<text class="tp-grid__label">工作地点</text>
-									<text class="tp-grid__value">{{ g.workLocation || '—' }}</text>
+									<text class="tp-grid__value">{{ taskInfoSummary.locationText }}</text>
 								</view>
 								<view class="tp-grid__cell">
-									<text class="tp-grid__label">{{ g.durationLabel }}</text>
-									<text class="tp-grid__value">{{ g.durationText }}</text>
+									<text class="tp-grid__label">{{ taskInfoSummary.durationLabel }}</text>
+									<text class="tp-grid__value">{{ taskInfoSummary.durationText }}</text>
 								</view>
 							</view>
 						</view>
-						<view v-if="!groups.length" class="tp-card">
-							<text class="tp-empty__text">暂无工种信息</text>
-						</view>
 					</view>
 
 					<!-- 工作时间：按工种多组 -->
@@ -186,7 +178,6 @@
 </template>
 
 <script>
-import store from '@/common/store.js'
 import { showToast } from '@/common/chat-data.js'
 import { getDraftDetail, getDraftWorkflowProgress } from '@/api/draft.js'
 import { getOrderPublishTask, publishOrderTask } from '@/api/order.js'
@@ -198,7 +189,7 @@ import {
 	normalizeDateYmd,
 	mapDraftDetailToCard
 } from '@/utils/draft.js'
-import { isStaffingStep, isEnterpriseCertSkipped } from '@/utils/process-card.js'
+import { isTaskPublishStep } from '@/utils/process-card.js'
 import { mapRegistrationBatchDetail } from '@/utils/registration-batch.js'
 
 /** 规范化 HH:mm */
@@ -292,7 +283,8 @@ export default {
 			groups: [],
 			statusDesc: '请确认任务信息后发布',
 			orderIdInner: null,
-			registrationDone: false,
+			/** 流程接口任务发布步骤：pending | active | done */
+			taskStepStatus: 'pending',
 			/** 已登记 < 计划人数，发布时需 allow_understaffed */
 			understaffed: false,
 			registeredCount: 0,
@@ -303,11 +295,8 @@ export default {
 		heroTitle() {
 			return this.readonly ? '任务发布详情' : '确认发布任务'
 		},
-		enterpriseOk() {
-			return store.isEnterpriseRegistered() === true
-		},
 		canPublish() {
-			return this.enterpriseOk && this.registrationDone
+			return this.taskStepStatus === 'active'
 		},
 		scheduleComplete() {
 			const list = this.groups || []
@@ -320,11 +309,8 @@ export default {
 			return true
 		},
 		gateTip() {
-			if (!this.enterpriseOk && !this.registrationDone) {
-				return '请先完成企业认证与人员登记后，再确认发布'
-			}
-			if (!this.enterpriseOk) return '请先完成企业认证后，再确认发布'
-			if (!this.registrationDone) return '请先完成人员登记后，再确认发布'
+			if (this.taskStepStatus === 'done') return '任务已发布'
+			if (this.taskStepStatus !== 'active') return '当前步骤尚未开始，请等待流程推进到任务发布'
 			return ''
 		},
 		confirmDisabled() {
@@ -334,6 +320,51 @@ export default {
 			if (this.readonly) return '已发布'
 			if (this.publishing) return '发布中...'
 			return '确认发布'
+		},
+		/** 任务信息汇总：多工种逗号拼接，单卡展示 */
+		taskInfoSummary() {
+			const list = this.groups || []
+			if (!list.length) {
+				return {
+					jobTypeText: '—',
+					workerCountText: '—',
+					locationText: '—',
+					durationLabel: '工作天数',
+					durationText: '—'
+				}
+			}
+			const types = []
+			const counts = []
+			const locations = []
+			const durations = []
+			let hasMonth = false
+			let hasDay = false
+			for (let i = 0; i < list.length; i++) {
+				const g = list[i]
+				const type = String(g.workType || '').trim() || '待确认'
+				types.push(type)
+				if (g.workerCount != null && g.workerCount !== '') {
+					counts.push(`${type}*${g.workerCount}人`)
+				}
+				const loc = String(g.workLocation || '').trim()
+				if (loc && locations.indexOf(loc) < 0) locations.push(loc)
+				const unit = formatWorkDurationUnit(g.settlementMode)
+				if (unit === '月') hasMonth = true
+				else hasDay = true
+				if (g.workDays != null && g.workDays !== '') {
+					durations.push(`${type}*${g.workDays}${unit}`)
+				}
+			}
+			let durationLabel = '工作天数'
+			if (hasMonth && !hasDay) durationLabel = '工作月数'
+			else if (hasMonth && hasDay) durationLabel = '工作工期'
+			return {
+				jobTypeText: types.join('，') || '—',
+				workerCountText: counts.length ? counts.join('，') : '—',
+				locationText: locations.join('，') || '—',
+				durationLabel,
+				durationText: durations.length ? durations.join('，') : '—'
+			}
 		}
 	},
 	watch: {
@@ -382,7 +413,6 @@ export default {
 			const emptyDate = viewMode ? '—' : '选择日期'
 			const emptyTime = viewMode ? '—' : '选择时间'
 			const list = Array.isArray(groups) ? groups : []
-			const rawHasTime = (raw) => raw != null && raw !== '' && /\d{1,2}:\d{2}/.test(String(raw))
 			return list.map((g, idx) => {
 				const startParts = splitDateTimeParts(g.workStartDate)
 				const endParts = splitDateTimeParts(g.workEndDate)
@@ -390,9 +420,9 @@ export default {
 				const days = g.workDays
 				let startDate = normalizeDateYmd(startParts.date)
 				let endDate = normalizeDateYmd(endParts.date)
-				let startTime = startDate && rawHasTime(g.workStartDate) ? normalizeTimeHm(startParts.time) : ''
-				let endTime = endDate && rawHasTime(g.workEndDate) ? normalizeTimeHm(endParts.time) : ''
-				// 可编辑发布：默认开始=明天 08:00，结束=按工期、18:00
+				// 接口返回若含时间，统一赋成 HH:mm；编辑态无时间时用默认
+				let startTime = startParts.time ? normalizeTimeHm(startParts.time) : ''
+				let endTime = endParts.time ? normalizeTimeHm(endParts.time) : ''
 				if (!viewMode) {
 					if (!startDate) startDate = tomorrowYmd()
 					if (!startTime) startTime = '08:00'
@@ -549,14 +579,15 @@ export default {
 			}
 			return ''
 		},
-		resolveRegistrationDone(workflowRaw) {
+		resolveTaskStepStatus(workflowRaw) {
 			const detail = mapRegistrationBatchDetail(workflowRaw || {})
 			const steps = detail.steps || []
-			const regDone = steps.some((s) => isStaffingStep(s) && s.status === 'done')
-			if (regDone) return true
-			const progress = detail.progress || {}
-			if (progress.total > 0 && progress.current >= progress.total) return true
-			return false
+			const task = steps.find((s) => isTaskPublishStep(s))
+			if (!task) return 'pending'
+			const s = String(task.status || 'pending').toLowerCase()
+			if (s === 'done' || s === 'completed' || s === 'finish' || s === 'finished') return 'done'
+			if (s === 'active' || s === 'current' || s === 'in_progress' || s === 'processing') return 'active'
+			return 'pending'
 		},
 		buildStatusDesc(workflowRaw) {
 			const detail = mapRegistrationBatchDetail(workflowRaw || {})
@@ -567,10 +598,11 @@ export default {
 				if (total > 0 && current < total) {
 					return `已登记 ${current}/${total}，未招满发布需确认缺编`
 				}
-				return '企业认证与人员登记已完成，可发布任务'
+				return '流程已到任务发布，可确认发布'
 			}
-			if (total > 0) return `已登记 ${current}/${total}，完成认证与登记后方可发布`
-			return '请先完成企业认证与人员登记'
+			if (this.taskStepStatus === 'done') return '任务已发布'
+			if (total > 0) return `已登记 ${current}/${total}，等待流程推进到任务发布`
+			return '等待流程推进到任务发布'
 		},
 		syncStaffingFromWorkflow(workflowRaw) {
 			const detail = mapRegistrationBatchDetail(workflowRaw || {})
@@ -583,11 +615,12 @@ export default {
 		/**
 		 * TaskPublishRequest：
 		 * { work_items: [{ id?, group_no?, job_type?, work_start_date, work_end_date }], allow_understaffed? }
+		 * work_start_date / work_end_date：YYYY-MM-DD HH:mm:ss（日期+时间拼成一个字段）
 		 */
 		buildPublishPayload(allowUnderstaffed = false) {
 			const workItems = (this.groups || []).map((g) => {
-				const start = normalizeDateYmd(g.startDate)
-				const end = normalizeDateYmd(g.endDate)
+				const start = joinDateTimePayload(g.startDate, g.startTime)
+				const end = joinDateTimePayload(g.endDate, g.endTime)
 				const item = {
 					work_start_date: start,
 					work_end_date: end
@@ -647,7 +680,7 @@ export default {
 				}
 
 				this.syncStaffingFromWorkflow(workflowRaw)
-				this.registrationDone = this.resolveRegistrationDone(workflowRaw)
+				this.taskStepStatus = this.resolveTaskStepStatus(workflowRaw)
 				this.statusDesc = this.buildStatusDesc(workflowRaw)
 			} catch (e) {
 				this.loadError = (e && (e.msg || e.message)) || '任务信息加载失败'
@@ -667,15 +700,6 @@ export default {
 				showToast(this.gateTip || '暂不可发布')
 				return
 			}
-			// 跳过认证不算「认证完」
-			if (!this.enterpriseOk) {
-				showToast('请先完成企业认证')
-				return
-			}
-			if (isEnterpriseCertSkipped() && !store.isEnterpriseRegistered()) {
-				showToast('请先完成企业认证')
-				return
-			}
 			const orderId = this.orderIdInner
 			if (orderId == null || orderId === '') {
 				showToast('缺少订单信息，暂无法发布')

huimv-employment/app/packageA/components/home/EnterpriseHome.vue

@@ -892,8 +892,7 @@ import { getDraftDetail, getDraftCostComparison, getDraftWorkflowProgress } from
 import { buildWorkflowChatCardMessage, mapRegistrationBatchDetail } from '@/utils/registration-batch.js'
 import {
 	markEnterpriseCertSkipped,
-	clearEnterpriseCertSkipped,
-	syncStepProcessPanel
+	clearEnterpriseCertSkipped
 } from '@/utils/process-card.js'
 import {
 	getNewChatGreeting,
@@ -1130,7 +1129,7 @@ export default {
 			this.user = s.user
 			this.enterprise = s.enterprise
 			await this.fetchSessions({ autoLoad: true })
-				this.refreshWorkflowProcessPanels()
+				await this.refreshWorkflowProcessPanels()
 			})().finally(() => {
 				this._initHomePromise = null
 			})
@@ -2045,7 +2044,7 @@ export default {
 					silent: true
 				})
 			}
-			this.refreshWorkflowProcessPanels()
+			await this.refreshWorkflowProcessPanels()
 		},
 		/**
 		 * 汇总需要展示进度卡的草稿 id：已确认草稿卡 / card_order / 会话进度列表
@@ -2660,48 +2659,68 @@ export default {
 			this.$set(msg.workflow, 'stepIndex', stepIdx)
 		},
 		/**
-		 * 从登记页返回：轻量同步企业认证面板。
-		 * 接口 steps 为 active 时不得被本地 registered 盖成 done。
+		 * 操作前拉 workflow-progress，用最新步骤 status 做门禁
+		 * @returns {{ msgIdx: number, msg: object, step: object }|null}
 		 */
-		refreshWorkflowProcessPanels() {
-			const registered = store.isEnterpriseRegistered()
-			if (registered) clearEnterpriseCertSkipped()
+		async resolveWorkflowStepFromApi(msgIdx, stepIdx, expectedCardType) {
+			const msg0 = this.messages[msgIdx]
+			if (!msg0 || msg0.type !== 'workflow' || !msg0.workflow) return null
+			const draftId = msg0.draftId != null ? msg0.draftId : msg0.workflow.draftId
+			if (draftId != null && draftId !== '') {
+				await this.refreshWorkflowCardByDraftId(draftId)
+			}
+			let nextIdx = msgIdx
+			for (let i = this.messages.length - 1; i >= 0; i--) {
+				const m = this.messages[i]
+				if (!m || m.type !== 'workflow') continue
+				const id = m.draftId != null ? m.draftId : (m.workflow && m.workflow.draftId)
+				if (draftId != null && draftId !== '' && String(id) === String(draftId)) {
+					nextIdx = i
+					break
+				}
+			}
+			const msg = this.messages[nextIdx]
+			if (!msg || !msg.workflow || !msg.workflow.steps) return null
+			let step = msg.workflow.steps[stepIdx]
+			if (expectedCardType && (!step || !step.processPanel || step.processPanel.cardType !== expectedCardType)) {
+				step = msg.workflow.steps.find((s) => s
+					&& s.processPanel
+					&& s.processPanel.cardType === expectedCardType) || null
+			}
+			if (!step) return null
+			return { msgIdx: nextIdx, msg, step }
+		},
+		/**
+		 * 从登记页返回：按流程接口重拉进度卡（不再用本地态改写 status）
+		 */
+		async refreshWorkflowProcessPanels() {
+			if (store.isEnterpriseRegistered()) clearEnterpriseCertSkipped()
+			const ids = []
+			const seen = {}
 			for (let i = 0; i < this.messages.length; i++) {
 				const msg = this.messages[i]
-				if (!msg || msg.type !== 'workflow' || !msg.workflow || !msg.workflow.steps) continue
-				const steps = msg.workflow.steps
-				for (let s = 0; s < steps.length; s++) {
-					const step = steps[s]
-					if (!step || !step.hasProcessPanel || !step.processPanel) continue
-					if (step.processPanel.cardType !== 'enterprise_cert') continue
-					let nextStatus = step.status || 'pending'
-					// 仅 pending → done；active/done 保持卡片已有状态（来自 workflow-progress）
-					if (registered && nextStatus === 'pending') {
-						nextStatus = 'done'
-						this.$set(step, 'status', 'done')
-						this.$set(step, 'statusLabel', '已完成')
-						this.$set(step, 'nodeIcon', '✓')
-						this.$set(step, 'nodeClass', 'fe-stepper__node fe-stepper__node--done')
-						this.$set(step, 'labelClass', 'fe-stepper__label fe-stepper__label--done')
-						this.$set(step, 'rootClass', 'fe-workflow-step fe-workflow-step--process fe-workflow-step--done')
-					}
-					syncStepProcessPanel(step, nextStatus, {
-						skipped: !registered && step.processPanel.processStatus === 'skipped'
-					})
-					this.$set(steps, s, step)
-				}
-				this.$set(this.messages, i, msg)
+				if (!msg || msg.type !== 'workflow' || !msg.workflow) continue
+				const id = msg.draftId != null ? msg.draftId : msg.workflow.draftId
+				if (id == null || id === '' || seen[String(id)]) continue
+				seen[String(id)] = true
+				ids.push(id)
+			}
+			for (let i = 0; i < ids.length; i++) {
+				await this.refreshWorkflowCardByDraftId(ids[i])
 			}
 		},
-		goWorkflowCertByIndex(msgIdx, stepIdx) {
-			const msg = this.messages[msgIdx]
-			if (!msg || msg.type !== 'workflow') return
-			const step = msg.workflow && msg.workflow.steps && msg.workflow.steps[stepIdx]
-			if (!step || !step.processPanel || step.processPanel.cardType !== 'enterprise_cert') return
+		async goWorkflowCertByIndex(msgIdx, stepIdx) {
+			const resolved = await this.resolveWorkflowStepFromApi(msgIdx, stepIdx, 'enterprise_cert')
+			if (!resolved) return
+			const { msg, step } = resolved
+			if (!step.processPanel || step.processPanel.cardType !== 'enterprise_cert') return
+			if (this.isWorkflowActionBlocked(step)) {
+				showToast((step.processPanel && step.processPanel.lockHint) || '当前步骤尚未开始')
+				return
+			}
 			const draftId = msg.draftId != null
 				? msg.draftId
 				: (msg.workflow && msg.workflow.draftId)
-			// 以流程步骤为准：active=未完成本单认证需提交；done=仅查看
 			const isDone = step.status === 'done'
 				|| (step.processPanel && step.processPanel.processStatus === 'done')
 			const readonly = !!isDone
@@ -2722,29 +2741,25 @@ export default {
 				// 忽略：仍按本地已登记状态刷新进度卡
 			}
 			if (store.isEnterpriseRegistered()) clearEnterpriseCertSkipped()
-			// 重建进度卡步骤条（门禁/连线/面板一并更新）
 			if (draftId != null && draftId !== '') {
 				await this.refreshWorkflowCardByDraftId(draftId)
 			} else {
-				this.refreshWorkflowProcessPanels()
+				await this.refreshWorkflowProcessPanels()
 			}
 			this.ensureChatBottom()
 		},
+		/** 门禁：登记/招聘不看 pending；其余 done 可查看、active 可操作、pending 禁用 */
 		isWorkflowActionBlocked(step) {
 			if (!step || !step.processPanel) return true
 			const panel = step.processPanel
-			// 已完成：仍可进弹层查看
-			if (step.status === 'done' || panel.processStatus === 'done' || panel.viewOnly) return false
-			// 登记/招聘：方案确认后可点，不因接口仍 pending 拦截
-			const isStaffingPanel = panel.cardType === 'registration_qr'
-				|| panel.cardType === 'worker_recruitment'
-			if (isStaffingPanel) {
-				return panel.actionDisabled === true || panel.actionLocked === true
+			// 人员登记 / 临时工招聘：始终可进
+			if (panel.cardType === 'registration_qr' || panel.cardType === 'worker_recruitment') {
+				return false
 			}
-			if (panel.actionDisabled === true || panel.actionLocked === true) return true
-			if (panel.processStatus === 'pending' || step.status === 'pending') return true
-			if (panel.processStatus !== 'current' && step.status !== 'active') return true
-			return false
+			if (step.status === 'done' || panel.processStatus === 'done' || panel.viewOnly) return false
+			if (step.status === 'active' || panel.processStatus === 'current') return false
+			if (panel.processStatus === 'skipped') return false
+			return true
 		},
 		isWorkflowStepViewOnly(step) {
 			if (!step || !step.processPanel) return false
@@ -2752,15 +2767,17 @@ export default {
 				|| step.processPanel.processStatus === 'done'
 				|| step.processPanel.viewOnly === true
 		},
-		goWorkflowRecruitByIndex(msgIdx, stepIdx) {
-			const msg = this.messages[msgIdx]
-			if (!msg || msg.type !== 'workflow' || !msg.workflow) return
-			const step = msg.workflow.steps && msg.workflow.steps[stepIdx]
-			if (!step || !step.processPanel || step.processPanel.cardType !== 'worker_recruitment') return
-			if (this.isWorkflowActionBlocked(step)) return
+		async goWorkflowRecruitByIndex(msgIdx, stepIdx) {
+			const resolved = await this.resolveWorkflowStepFromApi(msgIdx, stepIdx, 'worker_recruitment')
+			if (!resolved) return
+			const { msg, step } = resolved
+			if (!step.processPanel || step.processPanel.cardType !== 'worker_recruitment') return
+			if (this.isWorkflowActionBlocked(step)) {
+				showToast((step.processPanel && step.processPanel.lockHint) || '当前步骤尚未开始')
+				return
+			}
 			const draftId = msg.draftId != null ? msg.draftId : msg.workflow.draftId
 			const panel = step.processPanel
-			// 查看招聘：与人员登记进度弹层同一套内容，仅标题改为「临时工招聘」
 			const isViewRecruit = this.isWorkflowStepViewOnly(step)
 				|| panel.viewOnly === true
 				|| panel.primaryLabel === '查看招聘'
@@ -2786,12 +2803,15 @@ export default {
 			}
 			this.ensureChatBottom()
 		},
-		goWorkflowTaskPublishByIndex(msgIdx, stepIdx) {
-			const msg = this.messages[msgIdx]
-			if (!msg || msg.type !== 'workflow' || !msg.workflow) return
-			const step = msg.workflow.steps && msg.workflow.steps[stepIdx]
-			if (!step || !step.processPanel || step.processPanel.cardType !== 'task_publish') return
-			if (this.isWorkflowActionBlocked(step)) return
+		async goWorkflowTaskPublishByIndex(msgIdx, stepIdx) {
+			const resolved = await this.resolveWorkflowStepFromApi(msgIdx, stepIdx, 'task_publish')
+			if (!resolved) return
+			const { msg, step } = resolved
+			if (!step.processPanel || step.processPanel.cardType !== 'task_publish') return
+			if (this.isWorkflowActionBlocked(step)) {
+				showToast((step.processPanel && step.processPanel.lockHint) || '当前步骤尚未开始')
+				return
+			}
 			const draftId = msg.draftId != null ? msg.draftId : msg.workflow.draftId
 			const detail = msg.workflow.detail || {}
 			const orderId = detail.orderId || detail.order_id || null
@@ -2814,12 +2834,15 @@ export default {
 			}
 			this.ensureChatBottom()
 		},
-		goWorkflowSettlementByIndex(msgIdx, stepIdx) {
-			const msg = this.messages[msgIdx]
-			if (!msg || msg.type !== 'workflow' || !msg.workflow) return
-			const step = msg.workflow.steps && msg.workflow.steps[stepIdx]
-			if (!step || !step.processPanel || step.processPanel.cardType !== 'settlement') return
-			if (this.isWorkflowActionBlocked(step)) return
+		async goWorkflowSettlementByIndex(msgIdx, stepIdx) {
+			const resolved = await this.resolveWorkflowStepFromApi(msgIdx, stepIdx, 'settlement')
+			if (!resolved) return
+			const { msg, step } = resolved
+			if (!step.processPanel || step.processPanel.cardType !== 'settlement') return
+			if (this.isWorkflowActionBlocked(step)) {
+				showToast((step.processPanel && step.processPanel.lockHint) || '当前步骤尚未开始')
+				return
+			}
 			const detail = msg.workflow.detail || {}
 			const orderId = detail.orderId || detail.order_id || ''
 			const draftId = msg.draftId != null ? msg.draftId : msg.workflow.draftId
@@ -2830,12 +2853,15 @@ export default {
 			}
 			this.openProgressDetail(draftId)
 		},
-		goWorkflowInvoiceByIndex(msgIdx, stepIdx) {
-			const msg = this.messages[msgIdx]
-			if (!msg || msg.type !== 'workflow' || !msg.workflow) return
-			const step = msg.workflow.steps && msg.workflow.steps[stepIdx]
-			if (!step || !step.processPanel || step.processPanel.cardType !== 'invoice_archive') return
-			if (this.isWorkflowActionBlocked(step)) return
+		async goWorkflowInvoiceByIndex(msgIdx, stepIdx) {
+			const resolved = await this.resolveWorkflowStepFromApi(msgIdx, stepIdx, 'invoice_archive')
+			if (!resolved) return
+			const { msg, step } = resolved
+			if (!step.processPanel || step.processPanel.cardType !== 'invoice_archive') return
+			if (this.isWorkflowActionBlocked(step)) {
+				showToast((step.processPanel && step.processPanel.lockHint) || '当前步骤尚未开始')
+				return
+			}
 			const detail = msg.workflow.detail || {}
 			const draftId = msg.draftId != null ? msg.draftId : msg.workflow.draftId
 			const orderId = detail.orderId || detail.order_id || null
@@ -2994,12 +3020,12 @@ export default {
 		},
 		/** 人员登记：查看/分享（数据来自 workflow-progress） */
 		async openWorkflowQrByIndex(msgIdx, stepIdx) {
-			const msg = this.messages[msgIdx]
-			if (!msg || msg.type !== 'workflow' || !msg.workflow) return
-			const step = msg.workflow.steps && msg.workflow.steps[stepIdx]
-			if (!step || !step.processPanel || step.processPanel.cardType !== 'registration_qr') return
-			if (step.processPanel.actionDisabled) {
-				showToast(step.processPanel.lockHint || '当前步骤尚未开始')
+			const resolved = await this.resolveWorkflowStepFromApi(msgIdx, stepIdx, 'registration_qr')
+			if (!resolved) return
+			const { msg, step } = resolved
+			if (!step.processPanel || step.processPanel.cardType !== 'registration_qr') return
+			if (this.isWorkflowActionBlocked(step)) {
+				showToast((step.processPanel && step.processPanel.lockHint) || '当前步骤尚未开始')
 				return
 			}
 			const draftId = msg.draftId != null ? msg.draftId : msg.workflow.draftId
@@ -3046,13 +3072,13 @@ export default {
 			}
 		},
 		/** 人员登记：查看进度（FeProgressSheet 走 workflow-progress） */
-		openWorkflowQrProgressByIndex(msgIdx, stepIdx) {
-			const msg = this.messages[msgIdx]
-			if (!msg || msg.type !== 'workflow') return
-			const step = msg.workflow && msg.workflow.steps && msg.workflow.steps[stepIdx]
-			if (!step || !step.processPanel || step.processPanel.cardType !== 'registration_qr') return
-			if (step.processPanel.actionDisabled) {
-				showToast(step.processPanel.lockHint || '当前步骤尚未开始')
+		async openWorkflowQrProgressByIndex(msgIdx, stepIdx) {
+			const resolved = await this.resolveWorkflowStepFromApi(msgIdx, stepIdx, 'registration_qr')
+			if (!resolved) return
+			const { msg, step } = resolved
+			if (!step.processPanel || step.processPanel.cardType !== 'registration_qr') return
+			if (this.isWorkflowActionBlocked(step)) {
+				showToast((step.processPanel && step.processPanel.lockHint) || '当前步骤尚未开始')
 				return
 			}
 			this.openProgressDetail(msg.draftId || (msg.workflow && msg.workflow.draftId))

huimv-employment/app/packageA/enterprise/messages.vue

@@ -50,8 +50,8 @@ import FeBottomNav from '@/packageA/components/FeBottomNav.vue'
 import store from '@/common/store.js'
 import { getToken } from '@/utils/request.js'
 import { showToast } from '@/common/chat-data.js'
-import { listMyNotifications } from '@/api/notification.js'
-import { mapNotificationPage } from '@/utils/notification.js'
+import { listMyNotifications, markNotificationRead } from '@/api/notification.js'
+import { mapNotificationPage, mapNotificationItem, applyNotificationLocalRead } from '@/utils/notification.js'
 
 const PAGE_SIZE = 20
 
@@ -129,9 +129,27 @@ export default {
 				this.loadingMore = false
 			}
 		},
-		onItemByIndex(idx) {
+		async markReadIfNeeded(idx) {
+			const item = this.inbox[idx]
+			if (!item || item.readFlag === true) return
+			if (item.id == null || item.id === '') return
+			try {
+				const raw = await markNotificationRead(item.id, { showError: false })
+				const unread = raw && (raw.unreadCount != null ? raw.unreadCount : raw.unread_count)
+				if (unread != null) this.unreadCount = Number(unread)
+				const apiItem = raw && raw.item
+				const next = apiItem
+					? mapNotificationItem(apiItem, idx)
+					: applyNotificationLocalRead(item)
+				this.$set(this.inbox, idx, next)
+			} catch (e) {
+				// 已读失败不阻断跳转
+			}
+		},
+		async onItemByIndex(idx) {
 			const item = this.inbox[idx]
 			if (!item) return
+			await this.markReadIfNeeded(idx)
 			const url = item.actionUrl
 			if (!url || typeof url !== 'string' || url.indexOf('/packageA/') !== 0) {
 				showToast(item.title || '消息详情')

huimv-employment/app/packageA/enterprise/mine.vue

@@ -12,9 +12,6 @@
 						<text class="guest-card__mobile">{{ mobileMask || '未绑定企业' }}</text>
 						<view class="guest-card__badge">未认证</view>
 						<text class="guest-card__tip">完成企业认证后，可使用全部企业能力</text>
-						<view class="fe-btn fe-btn--primary fe-btn--lg fe-btn--full guest-card__cta" @tap="goRegister">
-							去企业认证
-						</view>
 					</view>
 
 					<view class="guest-logout-panel">
@@ -79,9 +76,6 @@ export default {
 			const s = store.getState()
 			this.mobileMask = (s.user && s.user.mobile) || ''
 		},
-		goRegister() {
-			uni.navigateTo({ url: '/packageA/enterprise/register' })
-		},
 		logout() {
 			store.logout()
 			uni.reLaunch({ url: '/packageA/auth/login' })
@@ -170,10 +164,6 @@ export default {
 	line-height: 1.5;
 }
 
-.guest-card__cta {
-	margin-top: 36rpx;
-}
-
 .guest-logout-panel {
 	background: #ffffff;
 	border-radius: 20rpx;

huimv-employment/app/utils/draft.js

@@ -544,15 +544,21 @@ function pickDateTimeRaw(g, camel, snake) {
 	return v == null ? '' : String(v)
 }
 
-/** 解析接口日期时间为 date(YYYY-MM-DD) + time(HH:mm) */
+/** 解析接口日期时间为 date(YYYY-MM-DD) + time(HH:mm，不含秒) */
 export function splitDateTimeParts(raw) {
 	if (raw == null || raw === '') {
 		return { date: '', time: '' }
 	}
 	let s = String(raw).trim().replace('T', ' ').replace(/\//g, '-')
-	const m = s.match(/^(\d{4}-\d{2}-\d{2})(?:\s+(\d{2}:\d{2})(?::\d{2})?)?/)
+	// 去掉时区尾巴：+08:00 / Z
+	s = s.replace(/([+-]\d{2}:?\d{2}|Z)$/i, '').trim()
+	const m = s.match(/^(\d{4}-\d{2}-\d{2})(?:[ T]+(\d{1,2}):(\d{2})(?::\d{2})?(?:\.\d+)?)?/)
 	if (!m) return { date: '', time: '' }
-	return { date: m[1], time: m[2] || '08:00' }
+	const date = m[1]
+	if (!m[2]) return { date, time: '' }
+	const hh = String(Math.min(23, Math.max(0, Number(m[2])))).padStart(2, '0')
+	const mm = String(m[3]).padStart(2, '0')
+	return { date, time: `${hh}:${mm}` }
 }
 
 /** 统一为 YYYY-MM-DD（去掉 /） */

huimv-employment/app/utils/notification.js

@@ -60,6 +60,14 @@ function buildItemClass(readFlag, handledFlag, notifyType) {
 	return parts.join(' ')
 }
 
+/** 本地标记已读后刷新卡片 class */
+export function applyNotificationLocalRead(item) {
+	if (!item) return item
+	const next = Object.assign({}, item, { readFlag: true })
+	next.itemClass = buildItemClass(true, next.handledFlag, next.notifyType)
+	return next
+}
+
 function formatRelativeTime(value) {
 	if (value == null || value === '') return ''
 	const s = String(value).replace('T', ' ')

huimv-employment/app/utils/process-card.js

@@ -79,10 +79,10 @@ function buildSecondaryBtnClass(disabled) {
 }
 
 /**
- * 串行步骤入口：锁定或待开始不可点；「当前 / 已完成」可进弹层（完成态弹层内再禁操作）
+ * 串行/引导步骤入口：以流程接口 status 为准
+ * pending → 禁用；active(current) / done / skipped → 可进（done 只读）
  */
-function isSequentialActionDisabled(processStatus, actionLocked) {
-	if (actionLocked) return true
+function isActionDisabledByApiStatus(processStatus) {
 	if (processStatus === PROCESS_STATUS.PENDING) return true
 	return false
 }
@@ -180,7 +180,7 @@ export function buildEnterpriseCertProcessPanel(stepStatus, options = {}) {
 	const processStatus = mapStepStatusToProcessStatus(stepStatus, options)
 	const statusMeta = buildProcessStatusMeta(processStatus)
 	const isDone = processStatus === PROCESS_STATUS.DONE
-	// 可与人员登记并行：未完成即可认证；已完成只读查看；已跳过仍可回来认证
+	const actionDisabled = isActionDisabledByApiStatus(processStatus)
 	const showActions = true
 	return {
 		cardType: 'enterprise_cert',
@@ -193,14 +193,15 @@ export function buildEnterpriseCertProcessPanel(stepStatus, options = {}) {
 			{ msgKey: 'b3', text: '法人身份验证' }
 		],
 		showActions,
-		showSkip: !isDone && processStatus !== PROCESS_STATUS.SKIPPED,
+		showSkip: !isDone && processStatus !== PROCESS_STATUS.SKIPPED && !actionDisabled,
 		primaryLabel: isDone ? '查看认证' : '去认证',
 		secondaryLabel: '跳过',
 		readonly: isDone,
-		actionLocked: false,
-		actionDisabled: false,
-		primaryBtnClass: buildPrimaryBtnClass(false),
-		secondaryBtnClass: buildSecondaryBtnClass(false),
+		actionLocked: actionDisabled,
+		actionDisabled,
+		lockHint: '当前步骤尚未开始',
+		primaryBtnClass: buildPrimaryBtnClass(actionDisabled),
+		secondaryBtnClass: buildSecondaryBtnClass(actionDisabled),
 		...statusMeta
 	}
 }
@@ -208,13 +209,11 @@ export function buildEnterpriseCertProcessPanel(stepStatus, options = {}) {
 /**
  * 任务发布步骤面板
  * @param {string} stepStatus done|active|pending
- * @param {{ actionLocked?: boolean }} [options]
  */
-export function buildTaskPublishProcessPanel(stepStatus, options = {}) {
+export function buildTaskPublishProcessPanel(stepStatus) {
 	const processStatus = mapStepStatusToProcessStatus(stepStatus)
 	const statusMeta = buildProcessStatusMeta(processStatus)
-	const actionLocked = options.actionLocked === true
-	const actionDisabled = isSequentialActionDisabled(processStatus, actionLocked)
+	const actionDisabled = isActionDisabledByApiStatus(processStatus)
 	const viewOnly = processStatus === PROCESS_STATUS.DONE
 	return {
 		cardType: 'task_publish',
@@ -227,10 +226,10 @@ export function buildTaskPublishProcessPanel(stepStatus, options = {}) {
 			{ msgKey: 'b3', text: '开启考勤打卡' }
 		],
 		showActions: true,
-		actionLocked,
+		actionLocked: actionDisabled,
 		actionDisabled,
 		viewOnly,
-		lockHint: '请先完成企业认证与人员登记',
+		lockHint: '当前步骤尚未开始',
 		primaryLabel: viewOnly ? '查看发布' : '去发布',
 		primaryIcon: '✈',
 		primaryBtnClass: buildPrimaryBtnClass(actionDisabled),
@@ -241,13 +240,11 @@ export function buildTaskPublishProcessPanel(stepStatus, options = {}) {
 /**
  * 结算打款步骤面板
  * @param {string} stepStatus done|active|pending
- * @param {{ actionLocked?: boolean }} [options]
  */
-export function buildSettlementProcessPanel(stepStatus, options = {}) {
+export function buildSettlementProcessPanel(stepStatus) {
 	const processStatus = mapStepStatusToProcessStatus(stepStatus)
 	const statusMeta = buildProcessStatusMeta(processStatus)
-	const actionLocked = options.actionLocked === true
-	const actionDisabled = isSequentialActionDisabled(processStatus, actionLocked)
+	const actionDisabled = isActionDisabledByApiStatus(processStatus)
 	const viewOnly = processStatus === PROCESS_STATUS.DONE
 	return {
 		cardType: 'settlement',
@@ -260,10 +257,10 @@ export function buildSettlementProcessPanel(stepStatus, options = {}) {
 			{ msgKey: 'b3', text: '一键打款到工人账户' }
 		],
 		showActions: true,
-		actionLocked,
+		actionLocked: actionDisabled,
 		actionDisabled,
 		viewOnly,
-		lockHint: '请先完成任务发布',
+		lockHint: '当前步骤尚未开始',
 		primaryLabel: '查看结算单',
 		primaryIcon: '◎',
 		primaryBtnClass: buildPrimaryBtnClass(actionDisabled),
@@ -274,13 +271,11 @@ export function buildSettlementProcessPanel(stepStatus, options = {}) {
 /**
  * 开票归档步骤面板
  * @param {string} stepStatus done|active|pending
- * @param {{ actionLocked?: boolean }} [options]
  */
-export function buildInvoiceArchiveProcessPanel(stepStatus, options = {}) {
+export function buildInvoiceArchiveProcessPanel(stepStatus) {
 	const processStatus = mapStepStatusToProcessStatus(stepStatus)
 	const statusMeta = buildProcessStatusMeta(processStatus)
-	const actionLocked = options.actionLocked === true
-	const actionDisabled = isSequentialActionDisabled(processStatus, actionLocked)
+	const actionDisabled = isActionDisabledByApiStatus(processStatus)
 	const viewOnly = processStatus === PROCESS_STATUS.DONE
 	return {
 		cardType: 'invoice_archive',
@@ -293,10 +288,10 @@ export function buildInvoiceArchiveProcessPanel(stepStatus, options = {}) {
 			{ msgKey: 'b3', text: '导出合规证据链' }
 		],
 		showActions: true,
-		actionLocked,
+		actionLocked: actionDisabled,
 		actionDisabled,
 		viewOnly,
-		lockHint: '请先完成结算打款',
+		lockHint: '当前步骤尚未开始',
 		primaryLabel: viewOnly ? '查看开票' : '去开票',
 		primaryIcon: '📄',
 		primaryBtnClass: buildPrimaryBtnClass(actionDisabled),
@@ -315,8 +310,7 @@ export function buildInvoiceArchiveProcessPanel(stepStatus, options = {}) {
  *   qrToken?: string,
  *   registered?: number,
  *   total?: number,
- *   highlight?: string,
- *   actionLocked?: boolean
+ *   highlight?: string
  * }} [qr]
  */
 export function buildRegistrationQrProcessPanel(stepStatus, qr = {}) {
@@ -326,9 +320,8 @@ export function buildRegistrationQrProcessPanel(stepStatus, qr = {}) {
 	const total = qr.total != null ? Number(qr.total) : 0
 	let progressText = qr.highlight || ''
 	if (!progressText && total > 0) progressText = `已登记 ${registered}/${total}`
-	// 以门禁 actionLocked 为准：方案确认后即使接口 pending 也可操作
-	const actionLocked = qr.actionLocked === true
-	const actionDisabled = actionLocked
+	// 登记/招聘：不因接口 pending 禁用，随时可操作
+	const actionDisabled = false
 	return {
 		cardType: 'registration_qr',
 		title: '人员登记',
@@ -342,9 +335,9 @@ export function buildRegistrationQrProcessPanel(stepStatus, qr = {}) {
 		total,
 		progressText,
 		showActions: true,
-		actionLocked,
+		actionLocked: false,
 		actionDisabled,
-		lockHint: '请先完成方案确认',
+		lockHint: '当前步骤尚未开始',
 		primaryLabel: '查看 / 分享',
 		secondaryLabel: '查看进度',
 		primaryBtnClass: buildPrimaryBtnClass(actionDisabled),
@@ -359,8 +352,7 @@ export function buildRegistrationQrProcessPanel(stepStatus, qr = {}) {
  * @param {{
  *   registered?: number,
  *   total?: number,
- *   highlight?: string,
- *   actionLocked?: boolean
+ *   highlight?: string
  * }} [options]
  */
 export function buildWorkerRecruitmentProcessPanel(stepStatus, options = {}) {
@@ -369,9 +361,8 @@ export function buildWorkerRecruitmentProcessPanel(stepStatus, options = {}) {
 	const registered = options.registered != null ? Number(options.registered) : 0
 	const total = options.total != null ? Number(options.total) : 0
 	const progressText = `已登记 ${registered}/${total || 0}`
-	// 以门禁 actionLocked 为准：方案确认后即使接口 pending 也可操作
-	const actionLocked = options.actionLocked === true
-	const actionDisabled = actionLocked
+	// 登记/招聘：不因接口 pending 禁用；done 仍可点「查看招聘」
+	const actionDisabled = false
 	const viewOnly = processStatus === PROCESS_STATUS.DONE
 	return {
 		cardType: 'worker_recruitment',
@@ -387,10 +378,10 @@ export function buildWorkerRecruitmentProcessPanel(stepStatus, options = {}) {
 		total,
 		progressText,
 		showActions: true,
-		actionLocked,
+		actionLocked: false,
 		actionDisabled,
 		viewOnly,
-		lockHint: '请先完成方案确认',
+		lockHint: '当前步骤尚未开始',
 		primaryLabel: viewOnly ? '查看招聘' : '去招聘',
 		primaryIcon: '🔍',
 		primaryBtnClass: buildPrimaryBtnClass(actionDisabled),
@@ -415,28 +406,20 @@ export function syncStepProcessPanel(step, stepStatus, options = {}) {
 			qrToken: prev.qrToken,
 			registered: prev.registered,
 			total: prev.total,
-			highlight: prev.progressText,
-			actionLocked: prev.actionLocked === true
+			highlight: prev.progressText
 		})
 	} else if (type === 'worker_recruitment') {
 		panel = buildWorkerRecruitmentProcessPanel(stepStatus || step.status, {
 			registered: prev.registered,
 			total: prev.total,
-			highlight: prev.progressText,
-			actionLocked: prev.actionLocked === true
+			highlight: prev.progressText
 		})
 	} else if (type === 'task_publish') {
-		panel = buildTaskPublishProcessPanel(stepStatus || step.status, {
-			actionLocked: prev.actionLocked === true
-		})
+		panel = buildTaskPublishProcessPanel(stepStatus || step.status)
 	} else if (type === 'settlement') {
-		panel = buildSettlementProcessPanel(stepStatus || step.status, {
-			actionLocked: prev.actionLocked === true
-		})
+		panel = buildSettlementProcessPanel(stepStatus || step.status)
 	} else if (type === 'invoice_archive') {
-		panel = buildInvoiceArchiveProcessPanel(stepStatus || step.status, {
-			actionLocked: prev.actionLocked === true
-		})
+		panel = buildInvoiceArchiveProcessPanel(stepStatus || step.status)
 	} else {
 		panel = buildEnterpriseCertProcessPanel(stepStatus || step.status, options)
 	}

huimv-employment/app/utils/recruit.js

@@ -2,6 +2,8 @@
  * 临时工招聘：条件展示 / 可用人员映射 / 提交载荷
  */
 
+import { formatWorkDurationUnit } from '@/utils/draft.js'
+
 function pick(raw, camel, snake) {
 	if (!raw || typeof raw !== 'object') return null
 	if (raw[camel] != null && raw[camel] !== '') return raw[camel]
@@ -24,23 +26,37 @@ export function syncRecruitGroupMeta(group) {
 	group.chevronText = group.expanded ? '▼' : '▶'
 }
 
-/** 搜索条件（多工种逗号分隔） */
+/**
+ * 搜索条件
+ * 需求人数：工种*人数（如 搬运*10人，分拣*5人）
+ * 工作天数：工种*{x}天/月（月结用月，其余用天）
+ */
 export function buildRecruitCriteria(workerGroups = []) {
 	const groups = Array.isArray(workerGroups) ? workerGroups.filter((g) => g && g.workType) : []
 	const criteriaTypes = groups.map((g) => g.workType).filter(Boolean)
-	const totalNeed = groups.reduce((sum, g) => sum + (Number(g.workerCount) || 0), 0)
+	const needParts = []
+	const dayParts = []
 	const locations = []
-	const daysSet = []
 	groups.forEach((g) => {
-		if (g.workLocation && locations.indexOf(g.workLocation) < 0) locations.push(g.workLocation)
-		if (g.workDays != null && g.workDays !== '') daysSet.push(Number(g.workDays))
+		const type = String(g.workType || '').trim()
+		if (!type) return
+		const count = Number(g.workerCount)
+		if (g.workerCount != null && g.workerCount !== '' && !Number.isNaN(count) && count > 0) {
+			needParts.push(`${type}*${count}人`)
+		}
+		const days = Number(g.workDays)
+		if (g.workDays != null && g.workDays !== '' && !Number.isNaN(days)) {
+			dayParts.push(`${type}*${days}${formatWorkDurationUnit(g.settlementMode)}`)
+		}
+		if (g.workLocation && locations.indexOf(g.workLocation) < 0) {
+			locations.push(g.workLocation)
+		}
 	})
-	const days = daysSet.length ? daysSet[0] : null
 	return {
 		jobTypeText: criteriaTypes.join('，') || '—',
-		needCountText: totalNeed > 0 ? `${totalNeed}人` : '—',
+		needCountText: needParts.length ? needParts.join('，') : '—',
 		locationText: locations.join('，') || '—',
-		daysText: days != null && !Number.isNaN(days) ? `${days}天` : '—'
+		daysText: dayParts.length ? dayParts.join('，') : '—'
 	}
 }
 

huimv-employment/app/utils/registration-batch.js

@@ -3,13 +3,12 @@ import {
 	isEnterpriseCertSkipped,
 	isRegistrationStep,
 	isWorkerRecruitmentStep,
-	isStaffingStep,
-	buildWorkerRecruitmentProcessPanel,
 	isTaskPublishStep,
 	isSettlementStep,
 	isInvoiceArchiveStep,
 	buildEnterpriseCertProcessPanel,
 	buildRegistrationQrProcessPanel,
+	buildWorkerRecruitmentProcessPanel,
 	buildTaskPublishProcessPanel,
 	buildSettlementProcessPanel,
 	buildInvoiceArchiveProcessPanel
@@ -233,100 +232,17 @@ function planConfirmedOrParallelReady(steps) {
 	return list.some((s) => isPlanConfirmedStep(s) && s.status === 'done')
 }
 
-/**
- * 流程门禁：
- * - 企业认证 / 人员登记|招聘：可并行（方案确认后可操作；登记/招聘 status 以接口为准）
- * - 任务发布 → 结算打款 → 开票归档：须上一环节完成
- */
-function applyParallelAndSequentialGates(steps, options = {}) {
-	const list = (Array.isArray(steps) ? steps : []).map((s) => Object.assign({}, s))
-	const registered = options.enterpriseRegistered === true
-	const certSkipped = options.certSkipped === true
-
-	const hasPlan = list.some(isPlanConfirmedStep)
-	const planDone = !hasPlan || list.some((s) => isPlanConfirmedStep(s) && s.status === 'done')
-
-	// 1) 并行段：认证 + 登记（接口已给 active/done 时以接口为准，勿用本地认证态覆盖）
-	for (let i = 0; i < list.length; i++) {
-		const s = list[i]
-		if (isEnterpriseAuthStep(s)) {
-			if (registered && s.status === 'pending') {
-				// 本地已认证且接口仍 pending（偶发滞后）时抬升
-				s.status = 'done'
-			} else if (!registered && certSkipped) {
-				s.status = 'pending'
-			} else if (!registered && planDone && s.status === 'pending') {
-				s.status = 'active'
-			}
-		} else if (isStaffingStep(s)) {
-			// 状态以接口为准（pending 保持灰色「未开始」）；方案确认后仅解锁操作
-			if (s.status === 'done') {
-				s._actionLocked = false
-			} else if (!planDone) {
-				s._actionLocked = true
-			} else {
-				s._actionLocked = false
-			}
-		}
-	}
-
-	const authOk = registered
-		|| certSkipped
-		|| list.some((s) => isEnterpriseAuthStep(s) && s.status === 'done')
-	// 有登记/招聘节点时必须 done；无该节点才视为不需要登记
-	const hasRegStep = list.some(isStaffingStep)
-	const regOk = hasRegStep
-		? list.some((s) => isStaffingStep(s) && s.status === 'done')
-		: false
-	const parallelReady = authOk && regOk
-
-	const taskDone = list.some((x) => isTaskPublishStep(x) && x.status === 'done')
-	const settleDone = list.some((x) => isSettlementStep(x) && x.status === 'done')
-		|| list.some((x) => {
-			const key = String((x && x.key) || '').toLowerCase()
-			const title = String((x && x.title) || '')
-			return (key === 'settlement_paid' || title.indexOf('已支付') >= 0) && x.status === 'done'
-		})
-
-	// 2) 串行段：任务发布 → 结算 → 开票（强制：未满足前置一律 pending + 锁定）
-	for (let i = 0; i < list.length; i++) {
-		const s = list[i]
-		if (isTaskPublishStep(s)) {
-			s._actionLocked = !parallelReady
-			if (s.status === 'done') {
-				s._actionLocked = false
-			} else if (!parallelReady) {
-				s.status = 'pending'
-			} else if (s.status !== 'active') {
-				// 前置已齐：仅允许 active 可点，其它保持 pending（等后端推进）
-				s.status = 'pending'
-				s._actionLocked = true
-			}
-		} else if (isSettlementStep(s)) {
-			s._actionLocked = !taskDone
-			if (s.status === 'done') {
-				s._actionLocked = false
-			} else if (!taskDone || s.status !== 'active') {
-				s.status = 'pending'
-				s._actionLocked = true
-			}
-		} else if (isInvoiceArchiveStep(s)) {
-			s._actionLocked = !settleDone
-			if (s.status === 'done') {
-				s._actionLocked = false
-			} else if (!settleDone || s.status !== 'active') {
-				s.status = 'pending'
-				s._actionLocked = true
-			}
-		}
-	}
-
-	return list
+/** 归一化流程接口步骤状态 → pending | active | done */
+function normalizeApiStepStatus(status) {
+	const s = String(status || 'pending').toLowerCase()
+	if (s === 'done' || s === 'completed' || s === 'finish' || s === 'finished') return 'done'
+	if (s === 'active' || s === 'current' || s === 'in_progress' || s === 'processing') return 'active'
+	return 'pending'
 }
 
 /**
  * workflow-progress / registration-batch 详情 → 聊天气泡进度卡片
- * 总进度按办理步骤（排除草稿节点）计算；不展示登记人数进度
+ * 步骤状态与可否操作一律以流程接口 status 为准（pending / active / done）
  * @param {object} raw API 原始响应或已 map 的 detail
  * @param {number|string} msgKey
  * @param {{ enterpriseRegistered?: boolean }} [options]
@@ -338,29 +254,10 @@ export function buildWorkflowChatCardMessage(raw, msgKey, options = {}) {
 	const registered = options.enterpriseRegistered === true
 	const certSkipped = !registered && isEnterpriseCertSkipped()
 
-	// 先归一化各步 status，再套并行/串行门禁，最后算连线与面板
-	let normalized = filtered.map((s) => {
-		const status = (s && s.status) || 'pending'
+	const normalized = filtered.map((s) => {
+		const status = normalizeApiStepStatus(s && s.status)
 		return Object.assign({}, s, { status })
 	})
-	// 已支付完成时，待结算引导卡同步为 done
-	const paidDone = normalized.some((s) => {
-		const key = String((s && s.key) || '').toLowerCase()
-		const title = String((s && s.title) || '')
-		return (key === 'settlement_paid' || title.indexOf('已支付') >= 0)
-			&& (s.status === 'done' || s.status === 'active')
-	})
-	if (paidDone) {
-		for (let i = 0; i < normalized.length; i++) {
-			if (isSettlementStep(normalized[i])) {
-				normalized[i] = Object.assign({}, normalized[i], { status: 'done' })
-			}
-		}
-	}
-	normalized = applyParallelAndSequentialGates(normalized, {
-		enterpriseRegistered: registered,
-		certSkipped
-	})
 
 	const qrCodeUrl = detail.qrCodeUrl || ''
 	const qrToken = detail.qrToken || ''
@@ -379,7 +276,6 @@ export function buildWorkflowChatCardMessage(raw, msgKey, options = {}) {
 		const isTask = isTaskPublishStep(s)
 		const isSettle = isSettlementStep(s)
 		const isInvoice = isInvoiceArchiveStep(s)
-		const actionLocked = s._actionLocked === true
 		// 步骤条展示名统一
 		let title = s.title || `步骤${i + 1}`
 		if (isReg) title = '人员登记'
@@ -415,22 +311,20 @@ export function buildWorkflowChatCardMessage(raw, msgKey, options = {}) {
 				qrToken,
 				registered: progressCurrent,
 				total: progressTotal,
-				highlight: s.highlight || '',
-				actionLocked
+				highlight: s.highlight || ''
 			})
 		} else if (isRecruit) {
 			processPanel = buildWorkerRecruitmentProcessPanel(status, {
 				registered: progressCurrent,
 				total: progressTotal,
-				highlight: s.highlight || '',
-				actionLocked
+				highlight: s.highlight || ''
 			})
 		} else if (isTask) {
-			processPanel = buildTaskPublishProcessPanel(status, { actionLocked })
+			processPanel = buildTaskPublishProcessPanel(status)
 		} else if (isSettle) {
-			processPanel = buildSettlementProcessPanel(status, { actionLocked })
+			processPanel = buildSettlementProcessPanel(status)
 		} else if (isInvoice) {
-			processPanel = buildInvoiceArchiveProcessPanel(status, { actionLocked })
+			processPanel = buildInvoiceArchiveProcessPanel(status)
 		}
 
 		let processMod = ''

huimv-employment/app/utils/settlement.js

@@ -1,5 +1,6 @@
 /**
  * 结算单摘要映射（含多工种拆分）
+ * 工种组一律取自结算详情 worker_groups，不再依赖草稿详情
  */
 import { formatMoney } from '@/utils/progress-action.js'
 import { normalizeWorkerGroups } from '@/utils/draft.js'
@@ -39,13 +40,11 @@ function mapFees(raw = {}) {
 }
 
 /**
- * 按草稿工种组拆分：企业人均成本 / 员工人均到手 / 工种实发合计
+ * 按结算详情 worker_groups 拆分：企业人均成本 / 员工人均到手 / 工种实发合计
  * 无工种组时退化为整体一条
  */
-export function buildSettlementWorkTypeGroups(raw = {}, draftGroups = []) {
-	const groups = Array.isArray(draftGroups) && draftGroups.length
-		? draftGroups
-		: normalizeWorkerGroups(raw)
+export function buildSettlementWorkTypeGroups(raw = {}) {
+	const groups = normalizeWorkerGroups(raw)
 	const totalOut = num(raw.totalOutflow != null ? raw.totalOutflow : raw.total_outflow)
 	const netTotal = num(raw.netAmount != null ? raw.netAmount : raw.net_amount)
 	const workerCount = num(raw.workerCount != null ? raw.workerCount : raw.worker_count)
@@ -102,8 +101,8 @@ export function buildSettlementWorkTypeGroups(raw = {}, draftGroups = []) {
 }
 
 /**
- * @param {object} raw 结算接口响应
- * @param {{ workerGroups?: Array, title?: string }} [ctx]
+ * @param {object} raw 结算接口响应（含 worker_groups）
+ * @param {{ title?: string }} [ctx]
  */
 export function mapSettlementSummary(raw = {}, ctx = {}) {
 	const fees = mapFees(raw)
@@ -113,10 +112,7 @@ export function mapSettlementSummary(raw = {}, ctx = {}) {
 	const total = raw.totalOutflow != null ? raw.totalOutflow : raw.total_outflow
 	const status = raw.settlementStatus || raw.settlement_status || ''
 	const workerCount = raw.workerCount != null ? raw.workerCount : raw.worker_count
-	const workTypeGroups = buildSettlementWorkTypeGroups(
-		Object.assign({}, raw, { title: ctx.title }),
-		ctx.workerGroups || []
-	)
+	const workTypeGroups = buildSettlementWorkTypeGroups(raw)
 
 	const enrichedRaw = Object.assign({}, raw, {
 		title: ctx.title || raw.title,