- 行程 {{ idx + 1 }}
+ 行程 {{ idx + 1 }}
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
添加行程
@@ -128,7 +156,8 @@
diff --git a/mobile-oa-h5/src/oa/kit-runtime.js b/mobile-oa-h5/src/oa/kit-runtime.js
index edfc0589..5975fff7 100644
--- a/mobile-oa-h5/src/oa/kit-runtime.js
+++ b/mobile-oa-h5/src/oa/kit-runtime.js
@@ -25,6 +25,7 @@ export {
export {
applyConfirmationKitDateLinkage,
applyConfirmationKitDefaults,
+ clearConfirmationDateManualAndRelink,
ensureConfirmationKitVisibility,
listConfirmationKitBindings,
listManualConfirmationDateFields,
diff --git a/mobile-oa-h5/src/oa/kit/oa-leave-hours.js b/mobile-oa-h5/src/oa/kit/oa-leave-hours.js
index beeee4c1..8c0c0891 100644
--- a/mobile-oa-h5/src/oa/kit/oa-leave-hours.js
+++ b/mobile-oa-h5/src/oa/kit/oa-leave-hours.js
@@ -4,7 +4,7 @@ const DEFAULT_LEAVE_WORK_HOURS = {
afternoonStart: "13:00",
afternoonEnd: "17:30"
};
-const DT_RE = /^(\d{4})-(\d{2})-(\d{2})[ T](\d{2}):(\d{2})$/;
+const DT_RE = /^(\d{4})-(\d{2})-(\d{2})[ T](\d{2}):(\d{2})(?::\d{2})?$/;
function parseHm(hm) {
const m = String(hm || "").trim().match(/^(\d{1,2}):(\d{2})$/);
if (!m) return null;
diff --git a/mobile-oa-h5/src/oa/kit/oa-overtime-hours.js b/mobile-oa-h5/src/oa/kit/oa-overtime-hours.js
index 7395efa8..fb7189e9 100644
--- a/mobile-oa-h5/src/oa/kit/oa-overtime-hours.js
+++ b/mobile-oa-h5/src/oa/kit/oa-overtime-hours.js
@@ -4,7 +4,7 @@ const DEFAULT_OVERTIME_WINDOWS = {
restBreakStart: "11:30",
restBreakEnd: "13:30"
};
-const DT_RE = /^(\d{4})-(\d{2})-(\d{2})[ T](\d{2}):(\d{2})$/;
+const DT_RE = /^(\d{4})-(\d{2})-(\d{2})[ T](\d{2}):(\d{2})(?::\d{2})?$/;
function parseHm(hm) {
const m = String(hm || "").trim().match(/^(\d{1,2}):(\d{2})$/);
if (!m) return null;
diff --git a/mobile-oa-h5/src/oa/kitchen-sink-rule.js b/mobile-oa-h5/src/oa/kitchen-sink-rule.js
index 15da18ab..60e7b0ff 100644
--- a/mobile-oa-h5/src/oa/kitchen-sink-rule.js
+++ b/mobile-oa-h5/src/oa/kitchen-sink-rule.js
@@ -44,10 +44,32 @@ export const kitchenSinkRule = [
{
type: 'datePicker',
field: 'bizDate',
- title: '日期',
+ title: '日期（年月日）',
value: '',
props: { type: 'date' }
},
+ {
+ type: 'datePicker',
+ field: 'bizDateTime',
+ title: '日期时间（年月日时分秒）',
+ value: '',
+ props: {
+ type: 'datetime',
+ format: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'YYYY-MM-DD HH:mm:ss'
+ }
+ },
+ {
+ type: 'datePicker',
+ field: 'bizDateTimeMinute',
+ title: '日期时间（到分）',
+ value: '',
+ props: {
+ type: 'datetime',
+ format: 'YYYY-MM-DD HH:mm',
+ valueFormat: 'YYYY-MM-DD HH:mm'
+ }
+ },
{ type: 'upload', field: 'files', title: '附件 upload', value: [] },
{ type: 'money', field: 'amount', title: '金额 money', value: '' },
{
@@ -120,14 +142,14 @@ export const kitchenSinkRule = [
field: 'leaveStart',
title: '开始时间',
$required: true,
- props: { type: 'datetime' }
+ props: { type: 'datetime', format: 'YYYY-MM-DD HH:mm', valueFormat: 'YYYY-MM-DD HH:mm' }
},
{
type: 'datePicker',
field: 'leaveEnd',
title: '结束时间',
$required: true,
- props: { type: 'datetime' }
+ props: { type: 'datetime', format: 'YYYY-MM-DD HH:mm', valueFormat: 'YYYY-MM-DD HH:mm' }
},
{
type: 'inputNumber',
@@ -161,14 +183,14 @@ export const kitchenSinkRule = [
field: 'otStart',
title: '开始时间',
$required: true,
- props: { type: 'datetime' }
+ props: { type: 'datetime', format: 'YYYY-MM-DD HH:mm', valueFormat: 'YYYY-MM-DD HH:mm' }
},
{
type: 'datePicker',
field: 'otEnd',
title: '结束时间',
$required: true,
- props: { type: 'datetime' }
+ props: { type: 'datetime', format: 'YYYY-MM-DD HH:mm', valueFormat: 'YYYY-MM-DD HH:mm' }
},
{
type: 'inputNumber',
diff --git a/mobile-oa-h5/src/oa/register-components.js b/mobile-oa-h5/src/oa/register-components.js
index b962f4d2..b052c9d9 100644
--- a/mobile-oa-h5/src/oa/register-components.js
+++ b/mobile-oa-h5/src/oa/register-components.js
@@ -10,6 +10,7 @@ import OaOwnerPersonSelect from './components/OaOwnerPersonSelect.vue'
import OaOwnerDeptSelect from './components/OaOwnerDeptSelect.vue'
import OaKitShell from './components/OaKitShell.vue'
import OaTripItinerary from './components/OaTripItinerary.vue'
+import OaDatePicker from './components/OaDatePicker.vue'
/** 与 web-admin type 名对齐 */
const REAL_COMPONENTS = {
@@ -37,4 +38,7 @@ export function registerOaComponents(formCreate) {
formCreate.component(name, comp)
}
formCreate.component('fcUpload', OaUploadField)
+ // 覆盖 @form-create/vant 内置日期：按 props.type 区分 date / datetime
+ formCreate.component('datePicker', OaDatePicker)
+ formCreate.component('fcDatePicker', OaDatePicker)
}
diff --git a/mobile-oa-h5/src/styles/oa-form.css b/mobile-oa-h5/src/styles/oa-form.css
index cd850837..3fe95d31 100644
--- a/mobile-oa-h5/src/styles/oa-form.css
+++ b/mobile-oa-h5/src/styles/oa-form.css
@@ -1,24 +1,33 @@
/* form-create + Vant：上下布局与左对齐兜底 */
.form-create-m .van-field__label--top {
width: 100%;
- margin-bottom: 6px;
+ margin-bottom: 4px;
text-align: left;
- color: var(--text-primary, #1f2a26);
- font-size: 13px;
+ color: var(--text-primary, #0f291e);
+ font-size: 12px;
font-weight: 600;
}
.form-create-m .van-field__control {
text-align: left !important;
+ font-size: 13px;
+ min-height: 22px;
+ line-height: 22px;
}
.form-create-m .van-field__control::placeholder {
text-align: left;
- color: var(--text-muted, #6b7b74);
+ color: var(--text-muted, #5f7a6d);
}
.form-create-m .fc-form-item {
- margin-bottom: 4px;
+ margin-bottom: 2px;
+}
+
+/* 表单项整体更紧凑 */
+.form-create-m .fc-form-item.van-cell {
+ padding-top: 8px;
+ padding-bottom: 8px;
}
/* 自定义控件 / 内置选择触发条：占满整行，箭头贴右 */
@@ -28,6 +37,7 @@
.form-create-m ._fc-calendar,
.form-create-m ._fc-cascader,
.form-create-m .oa-pick,
+.form-create-m .oa-owner-field,
.form-create-m .oa-money,
.form-create-m .oa-number,
.form-create-m .oa-recv,
@@ -58,6 +68,40 @@
align-items: center;
width: 100%;
box-sizing: border-box;
+ min-height: 32px;
+ padding-top: 5px;
+ padding-bottom: 5px;
+ padding-left: 0;
+ padding-right: 0;
+}
+
+.form-create-m ._fc-select > .van-cell .van-field__control,
+.form-create-m ._fc-date-picker > .van-cell .van-field__control,
+.form-create-m ._fc-time-picker > .van-cell .van-field__control,
+.form-create-m ._fc-calendar > .van-cell .van-field__control,
+.form-create-m ._fc-cascader > .van-cell .van-field__control,
+.form-create-m .oa-pick > .van-cell .van-field__control,
+.form-create-m .oa-money > .van-cell .van-field__control,
+.form-create-m .oa-number > .van-cell .van-field__control,
+.form-create-m .oa-recv > .van-cell .van-field__control {
+ font-size: 13px;
+ min-height: 22px;
+ line-height: 22px;
+}
+
+/*
+ * 归属人 / 归属部门：不可改选时仍用 disabled 防点开，但展示色用正文色（勿灰字难读）。
+ * Vant disabled 会设 -webkit-text-fill-color，须一并覆盖。
+ */
+.form-create-m .oa-owner-field.is-locked .van-field__control,
+.form-create-m .oa-owner-field.is-locked .van-field__control:disabled {
+ color: var(--text-primary, #0f291e) !important;
+ -webkit-text-fill-color: var(--text-primary, #0f291e) !important;
+ opacity: 1;
+}
+
+.form-create-m .oa-owner-field.is-locked .van-cell__right-icon {
+ color: #cbd5e1;
}
.form-create-m ._fc-select > .van-cell > .van-cell__title,
@@ -94,8 +138,9 @@
.form-create-m .oa-pick > .van-cell > .van-cell__right-icon,
.form-create-m .oa-recv > .van-cell > .van-cell__right-icon {
flex: 0 0 auto;
- margin-left: 8px;
+ margin-left: 6px;
order: 3;
+ font-size: 14px;
}
/* 行程内带自身 label 的 Field：标题在上，箭头仍在内容行右侧 */
@@ -104,22 +149,77 @@
flex-wrap: wrap;
align-items: center;
width: 100%;
+ box-sizing: border-box;
+ background: transparent;
+ padding-top: 0;
+ padding-bottom: 0;
+ padding-left: 0;
+ padding-right: 0;
+}
+
+.form-create-m .oa-trip .van-field--label-top::after {
+ display: none;
}
.form-create-m .oa-trip .van-field--label-top > .van-cell__title {
flex: 0 0 100%;
width: 100%;
+ max-width: 100%;
+ margin-bottom: 4px;
}
+/*
+ * 内容行：value 吃剩余宽度，right-icon 固定同行右侧。
+ * 窄列（开始/结束时段）也勿让 value 占满导致箭头掉到下一行。
+ * value 与箭头强制同高并垂直居中，避免选中后文字相对箭头偏上/偏下。
+ */
.form-create-m .oa-trip .van-field--label-top > .van-cell__value {
- flex: 1 1 auto;
+ flex: 1 1 0% !important;
+ width: 0 !important;
+ max-width: none !important;
min-width: 0;
+ align-self: center;
+ display: flex;
+ align-items: center;
text-align: left;
}
+.form-create-m .oa-trip .van-field--label-top .van-field__body {
+ display: flex;
+ align-items: center;
+ width: 100%;
+ min-height: 22px;
+}
+
+.form-create-m .oa-trip .van-field--label-top .van-field__control {
+ height: 22px;
+ min-height: 22px;
+ line-height: 22px;
+ padding: 0;
+}
+
.form-create-m .oa-trip .van-field--label-top > .van-cell__right-icon {
flex: 0 0 auto;
- margin-left: 8px;
+ align-self: center;
+ display: inline-flex;
+ align-items: center;
+ justify-content: center;
+ margin-left: 4px;
+ order: 3;
+ height: 22px;
+ font-size: 14px;
+ line-height: 22px;
+}
+
+/* 日期+时段同行：列间距，不再额外塞左右 padding（由卡片内边距统一） */
+.form-create-m .oa-trip .oa-trip__row .van-field {
+ padding-left: 0;
+ padding-right: 0;
+}
+
+.form-create-m .oa-trip .oa-trip__row .oa-trip__field--half.van-field {
+ padding-left: 0;
+ padding-right: 0;
}
/* 外层表单项：标题独占一行；内容区整行左对齐（箭头在内层控件右侧） */
@@ -130,7 +230,7 @@
.form-create-m .fc-form-item.van-field--label-top > .van-cell__title {
flex: 0 0 100%;
width: 100%;
- margin-bottom: 6px;
+ margin-bottom: 4px;
}
.form-create-m .fc-form-item.van-field--label-top > .van-cell__value {
@@ -156,7 +256,7 @@
align-items: center;
justify-content: space-between;
padding: 14px 16px;
- border-bottom: 1px solid var(--border, #dcebe4);
+ border-bottom: 1px solid var(--border, #d8f3e5);
}
.oa-pick__hd strong,
@@ -164,14 +264,14 @@
.oa-rel__hd strong {
font-size: 16px;
font-weight: 700;
- color: var(--text-primary, #1f2a26);
+ color: var(--text-primary, #0f291e);
}
.oa-pick__hd > span:first-child,
.oa-recv__hd > span:first-child,
.oa-rel__hd > span:first-child {
min-width: 48px;
- color: var(--text-muted, #6b7b74);
+ color: var(--text-muted, #5f7a6d);
font-size: 14px;
}
@@ -179,81 +279,152 @@
.oa-recv__ok,
.oa-rel__ok {
min-width: 48px;
- color: var(--brand-green, #16a34a);
+ color: var(--brand-green, #22c55e);
font-size: 14px;
font-weight: 600;
text-align: right;
}
+/* 方案 C · 分割线行表 */
.oa-pick__list,
.oa-recv__list,
.oa-rel__picker {
flex: 1;
- padding: 12px;
+ padding: 0;
overflow: auto;
- background: transparent;
+ background: #fff;
box-sizing: border-box;
}
-.oa-pick__list .van-cell,
-.oa-recv__list .van-cell,
-.oa-rel__picker .van-cell {
- align-items: center;
- margin-bottom: 10px;
- padding: 12px 14px;
- text-align: left;
- background: transparent;
- border-radius: 10px;
+/*
+ * 弹窗列表行（对齐关联审批单 oa-rel__pick-row）
+ * 人员 / 部门 / 收款账户 / 关联审批 共用，避免 van-cell 被表单样式污染
+ */
+.oa-sheet-row {
+ display: flex;
+ gap: 10px;
+ align-items: flex-start;
+ padding: 12px 16px;
+ background: #fff;
+ border-bottom: 1px solid #f1f5f9;
+ box-sizing: border-box;
}
-.oa-pick__list .van-cell:last-child,
-.oa-recv__list .van-cell:last-child,
-.oa-rel__picker .van-cell:last-child {
+.oa-sheet-row:last-child {
+ border-bottom: none;
+}
+
+.oa-sheet-row.is-selected {
+ background: var(--brand-green-soft, #ecfdf5);
+}
+
+.oa-sheet-row.is-selected .oa-sheet-row__title {
+ color: #15803d;
+}
+
+.oa-sheet-row--center {
+ align-items: center;
+}
+
+.oa-sheet-row__check {
+ flex-shrink: 0;
+ margin-top: 10px;
+ margin-right: 0;
+}
+
+.oa-sheet-row--center .oa-sheet-row__check {
+ margin-top: 0;
+}
+
+.oa-sheet-row__avatar {
+ display: flex;
+ flex-shrink: 0;
+ align-items: center;
+ justify-content: center;
+ width: 36px;
+ height: 36px;
+ margin-top: 2px;
+ border-radius: 8px;
+ color: #fff;
+ font-size: 12px;
+ font-weight: 600;
+ letter-spacing: 0.3px;
+}
+
+.oa-sheet-row__main {
+ flex: 1;
+ min-width: 0;
+}
+
+.oa-sheet-row__title {
+ margin: 0 0 4px;
+ color: var(--text-primary, #0f291e);
+ font-size: 14px;
+ font-weight: 600;
+ line-height: 1.4;
+ word-break: break-all;
+}
+
+.oa-sheet-row__title:last-child {
margin-bottom: 0;
}
-.oa-pick__list .van-cell::after,
-.oa-recv__list .van-cell::after,
-.oa-rel__picker .van-cell::after {
- display: none;
+.oa-sheet-row__meta {
+ overflow: hidden;
+ color: var(--text-muted, #5f7a6d);
+ font-size: 12px;
+ line-height: 1.45;
+ text-overflow: ellipsis;
+ white-space: nowrap;
}
-.oa-pick__list .van-cell__title,
-.oa-recv__list .van-cell__title,
-.oa-rel__picker .van-cell__title {
- text-align: left;
+.oa-sheet-row__exp {
+ display: inline-flex;
+ flex-shrink: 0;
+ align-items: center;
+ justify-content: center;
+ width: 22px;
+ height: 22px;
+ padding: 0;
+ border: 0;
+ background: transparent;
+ color: var(--text-muted, #5f7a6d);
+ font-size: 12px;
+ line-height: 1;
}
-.oa-pick__list .van-cell__label,
-.oa-recv__list .van-cell__label,
-.oa-rel__picker .van-cell__label {
- text-align: left;
- color: var(--text-muted, #6b7b74);
+.oa-sheet-row__exp--spacer {
+ visibility: hidden;
+ pointer-events: none;
}
.oa-pick__check,
.oa-recv__check,
.oa-rel__check {
- margin-right: 8px;
+ margin-right: 10px;
}
/* 弹窗检索：勿继承表单 labelAlign=top，保持单行垂直居中 */
.oa-pick__sheet .van-search,
.oa-recv__sheet .van-search,
-.oa-rel__sheet .van-search {
+.oa-rel__sheet .van-search,
+.oa-flow-picker .van-search {
padding: 10px 12px;
background: #fff;
}
.oa-pick__sheet .van-search .van-search__content,
.oa-recv__sheet .van-search .van-search__content,
-.oa-rel__sheet .van-search .van-search__content {
+.oa-rel__sheet .van-search .van-search__content,
+.oa-flow-picker .van-search .van-search__content {
align-items: center;
+ padding-right: 4px;
}
.oa-pick__sheet .van-search .van-cell,
.oa-recv__sheet .van-search .van-cell,
-.oa-rel__sheet .van-search .van-cell {
+.oa-rel__sheet .van-search .van-cell,
+.oa-flow-picker .van-search .van-cell {
align-items: center;
padding-top: 0;
padding-bottom: 0;
@@ -262,14 +433,28 @@
.oa-pick__sheet .van-search .van-field__body,
.oa-recv__sheet .van-search .van-field__body,
-.oa-rel__sheet .van-search .van-field__body {
+.oa-rel__sheet .van-search .van-field__body,
+.oa-flow-picker .van-search .van-field__body {
align-items: center;
}
.oa-pick__sheet .van-search .van-field__control,
.oa-recv__sheet .van-search .van-field__control,
-.oa-rel__sheet .van-search .van-field__control {
+.oa-rel__sheet .van-search .van-field__control,
+.oa-flow-picker .van-search .van-field__control {
height: 36px;
line-height: 36px;
text-align: left !important;
}
+
+/*
+ * Vant 默认 .van-field__clear { margin-right: calc(var(--van-padding-xs) * -1) }
+ * 会把清除图标贴到搜索框右缘；对齐发起审批页检索框内边距（约 12px）。
+ */
+.oa-pick__sheet .van-search .van-field__clear,
+.oa-recv__sheet .van-search .van-field__clear,
+.oa-rel__sheet .van-search .van-field__clear,
+.oa-flow-picker .van-search .van-field__clear {
+ margin-right: 4px;
+ padding-right: 8px;
+}
diff --git a/mobile-oa-h5/src/styles/tokens.css b/mobile-oa-h5/src/styles/tokens.css
index 05dc394c..2431ad3d 100644
--- a/mobile-oa-h5/src/styles/tokens.css
+++ b/mobile-oa-h5/src/styles/tokens.css
@@ -1,11 +1,20 @@
:root {
- --brand-green: #16a34a;
- --brand-green-dark: #15803d;
- --brand-green-soft: #f0fdf4;
- --bg-page: #f5f8f7;
- --text-primary: #1f2a26;
- --text-muted: #6b7b74;
- --border: #dcebe4;
+ /* 方案 A · 薄荷微风 — 与 mobile-h5 对齐 */
+ --brand-green: #22c55e;
+ --brand-green-dark: #16a34a;
+ --brand-green-soft: #ecfdf5;
+ --header-fg: #065f46;
+ --bg-page: #ffffff;
+ --surface: #ffffff;
+ --text-primary: #0f291e;
+ --text-muted: #5f7a6d;
+ --border: #d8f3e5;
+ --danger: #ef4444;
+ --warning: #d97706;
+ --success: #10b981;
+ --barley-yellow: #fbbf24;
+ --barley-yellow-soft: #fffbeb;
+ --shadow-soft: 0 4px 16px rgba(22, 163, 74, 0.07);
}
body {
margin: 0;
diff --git a/mobile-oa-h5/src/views/FormSink.vue b/mobile-oa-h5/src/views/FormSink.vue
index ae1912b5..f3f6b418 100644
--- a/mobile-oa-h5/src/views/FormSink.vue
+++ b/mobile-oa-h5/src/views/FormSink.vue
@@ -47,8 +47,8 @@ async function onValidate() {
.sink__hd {
padding: 14px 16px;
font-weight: 700;
- color: #fff;
- background: linear-gradient(135deg, var(--brand-green), var(--brand-green-dark));
+ color: var(--header-fg, #065f46);
+ background: linear-gradient(160deg, #f0fdf4 0%, #d1fae5 58%, #a7f3d0 100%);
}
.sink__body {
flex: 1;
diff --git a/mobile-oa-h5/src/views/OaStart.vue b/mobile-oa-h5/src/views/OaStart.vue
index cb4e4578..24adf5c5 100644
--- a/mobile-oa-h5/src/views/OaStart.vue
+++ b/mobile-oa-h5/src/views/OaStart.vue
@@ -10,6 +10,26 @@
:rule="formRule"
:option="formOption"
/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
选择偏好方案（可点击下方卡片，也可在上方 Tab 预览）：
+
+
+
+
+