diff --git a/src/pages.json b/src/pages.json
index 44c320e..22a7113 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -67,6 +67,14 @@
"disableScroll": true
}
},
+ {
+ "path": "pages/approval/approval-result",
+ "type": "page",
+ "style": {
+ "navigationStyle": "custom",
+ "disableScroll": true
+ }
+ },
{
"path": "pages/approval/approval",
"type": "page",
diff --git a/src/pages/approval/approval-detail.vue b/src/pages/approval/approval-detail.vue
index 9b74160..6032e10 100644
--- a/src/pages/approval/approval-detail.vue
+++ b/src/pages/approval/approval-detail.vue
@@ -17,8 +17,12 @@
- 拒绝
- 同意
+
+ 拒绝
+
+
+ 同意
+
更多
@@ -33,19 +37,18 @@
diff --git a/src/pages/approval/approval-result.vue b/src/pages/approval/approval-result.vue
new file mode 100644
index 0000000..e870c42
--- /dev/null
+++ b/src/pages/approval/approval-result.vue
@@ -0,0 +1,95 @@
+
+{
+ style: {
+ navigationStyle: 'custom',
+ disableScroll: true
+ }
+}
+
+
+
+
+
+
+ *
+ 转审人
+
+
+
+
+
+
+
+
+
+ *
+ 退回至
+
+ 选择退回节点,对方处理后,将按原有流程重新审批
+
+
+
+
+ 发起人
+
+
+
+ xxx
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/approval/components/ApprovalCreate.vue b/src/pages/approval/components/ApprovalCreate.vue
index 6f939c9..8fe7b0c 100644
--- a/src/pages/approval/components/ApprovalCreate.vue
+++ b/src/pages/approval/components/ApprovalCreate.vue
@@ -148,4 +148,8 @@
:deep(.wd-step__line) {
background: #255cf7;
}
+
+ :deep(.wd-step.is-vertical .wd-step__content) {
+ padding-bottom: 0;
+ }
diff --git a/src/pages/approval/components/DatetimePicker.vue b/src/pages/approval/components/DatetimePicker.vue
index 338eed4..8afab41 100644
--- a/src/pages/approval/components/DatetimePicker.vue
+++ b/src/pages/approval/components/DatetimePicker.vue
@@ -17,7 +17,7 @@
*
{{ title }}
-
+
{{ text || placeholder }}
diff --git a/src/pages/approval/components/Description.vue b/src/pages/approval/components/Description.vue
index 5bed04c..e763af8 100644
--- a/src/pages/approval/components/Description.vue
+++ b/src/pages/approval/components/Description.vue
@@ -1,5 +1,5 @@
-
+
{{ title }}
diff --git a/src/pages/approval/components/Form.vue b/src/pages/approval/components/Form.vue
index 3538184..32224a8 100644
--- a/src/pages/approval/components/Form.vue
+++ b/src/pages/approval/components/Form.vue
@@ -1,7 +1,7 @@
-
+
diff --git a/src/pages/approval/components/Input.vue b/src/pages/approval/components/Input.vue
index d24115a..6a341bc 100644
--- a/src/pages/approval/components/Input.vue
+++ b/src/pages/approval/components/Input.vue
@@ -104,6 +104,7 @@
}
:deep(.wd-input__inner) {
+ height: var(--wot-input-inner-height, 24px);
font-size: 0.875rem;
}
diff --git a/src/pages/approval/components/NavigatorSelector.vue b/src/pages/approval/components/NavigatorSelector.vue
index fe88998..810b893 100644
--- a/src/pages/approval/components/NavigatorSelector.vue
+++ b/src/pages/approval/components/NavigatorSelector.vue
@@ -15,7 +15,7 @@
*
{{ title }}
-
+
{{ text || placeholder }}
diff --git a/src/pages/approval/components/SelectPicker.vue b/src/pages/approval/components/SelectPicker.vue
index 65aad0e..878d8ee 100644
--- a/src/pages/approval/components/SelectPicker.vue
+++ b/src/pages/approval/components/SelectPicker.vue
@@ -92,7 +92,7 @@