@@ -213,7 +221,7 @@
+ layout="total, sizes, prev, pager, next" :total="totalSize.total">
@@ -252,7 +260,7 @@ const loading = ref(false)
const tableRef = ref
>();
const mailStore = useMailStore();
mailStore.getMailCategorys();
-const { dictData } = useDictData(["mail_source", "mail_level", "mail_state"]);
+const { dictData } = useDictData(["mail_source", "mail_level", "mail_state", "appeal_state"]);
const showLabel = ref(false);
const showCheck = ref(false)
diff --git a/src/views/work/Todo.vue b/src/views/work/Todo.vue
index 4fabf6c..f7c7341 100644
--- a/src/views/work/Todo.vue
+++ b/src/views/work/Todo.vue
@@ -241,6 +241,7 @@
:page-size="query.size"
v-model:current-page="query.current"
:total="totalSize.total"
+ layout="total, sizes, prev, pager, next"
>
diff --git a/src/views/work/components/AppealProgress.vue b/src/views/work/components/AppealProgress.vue
index ba4bb42..d1f17bb 100644
--- a/src/views/work/components/AppealProgress.vue
+++ b/src/views/work/components/AppealProgress.vue
@@ -9,13 +9,13 @@
- 申诉中
+ 申诉进度
-
-
-
+
+
+
@@ -61,8 +61,11 @@ watch(
getDetail()
}
);
+
+const appeal = ref({})
const getDetail = () => {
getAppeal({ id: props.mailId }).then((res) => {
+ appeal.value = res
stepStatus.value = []
appealReason.value = res.appealReason
fileList.value = JSON.parse(res.attachments)
@@ -156,11 +159,10 @@ $publicHeight: 35px;
.steps {
width: 100%;
- margin: auto 0;
- height: $publicHeight;
::v-deep .el-step {
height: 100%;
+ vertical-align: top;
.el-step__icon.is-text {
background-color: $publicColor;
@@ -171,31 +173,21 @@ $publicHeight: 35px;
}
.el-step__main {
- width: 200px;
- }
-
- .el-step__line {
- background-color: rgba(0, 0, 0, 0.15);
- margin-right: 10px;
- margin-left: 135px;
- top: 50%;
- height: 1px;
- }
-
- .el-step__title {
- color: #333333;
- width: 100%;
- position: absolute;
- top: calc((100% - 135%)/2);
- left: calc(0% + 30px);
+ width: 240px;
+ .el-step__description {
+ white-space: pre-wrap;
+ }
}
.el-step__title.is-wait {
width: 100%;
color: #999999;
}
-
+ .el-step__head {
+ margin-bottom: 8px;
+ }
.el-step__head.is-wait {
+
.el-step__icon.is-text {
background: #FFF;
diff --git a/src/views/work/components/InitiateCountersign.vue b/src/views/work/components/InitiateCountersign.vue
index b2bea87..944dec4 100644
--- a/src/views/work/components/InitiateCountersign.vue
+++ b/src/views/work/components/InitiateCountersign.vue
@@ -50,7 +50,7 @@
添加部门
-
会签部门数量最多3个(次责单位无法参与会签)
+
会签部门数量最多3个(主责单位/次责单位无法参与会签)
二级主责单位:{{ mail.firstDistributeInfo?.mainDept?.name }}
二级次责单位1:{{ mail.firstDistributeInfo?.secondDept1?.name }}
diff --git a/src/views/work/components/MailDialog.vue b/src/views/work/components/MailDialog.vue
index c0ec1e8..1e2b1bd 100644
--- a/src/views/work/components/MailDialog.vue
+++ b/src/views/work/components/MailDialog.vue
@@ -634,13 +634,14 @@ async function getDetail() {
.map((item) => item.trim());
}
actions.value = data.actions;
-
nextTick(() => {
- flowMaxHeight.value =
+ if (leftContainerRef.value.offsetHeight) {
+ flowMaxHeight.value =
leftContainerRef.value.offsetHeight -
(mailInfoRef.value?.offsetHeight || 0) -
flowHeaderRef.value.offsetHeight -
(timerRef.value?.offsetHeight || 0);
+ }
});
}
diff --git a/src/views/work/components/templates/CoHandling.vue b/src/views/work/components/templates/CoHandling.vue
index 5b91928..ecc8c65 100644
--- a/src/views/work/components/templates/CoHandling.vue
+++ b/src/views/work/components/templates/CoHandling.vue
@@ -20,7 +20,7 @@
diff --git a/src/views/work/components/templates/CompletionDetail.vue b/src/views/work/components/templates/CompletionDetail.vue
index 797df70..a955138 100644
--- a/src/views/work/components/templates/CompletionDetail.vue
+++ b/src/views/work/components/templates/CompletionDetail.vue
@@ -26,7 +26,8 @@