fix: 测试问题修改

dev_1.0.0
xiangcongshuai 11 months ago
parent ffa63d8ab3
commit 75b8e7fe06

@ -64,6 +64,7 @@ const setTags = (route: any) => {
});
if (!isExist) {
if (route.path === "/home") return;
tabs.setTabsItem({
name: route.name,
title: route.meta.title,

@ -180,6 +180,7 @@
transform:translate(-50%,-50%);
max-height:calc(100% - 30px);
max-width:calc(100% - 30px);
background: linear-gradient(180deg, #e1ecfe 0%, #ffffff 30%) !important;
}
.el-dialog .el-dialog__body{
flex:1;

@ -55,7 +55,6 @@ const submit = () => {
</script>
<style lang="scss" scoped>
.Approved {
background: linear-gradient(180deg, #e1ecfe 0%, #ffffff 30%);
.Approved-header {
display: flex;
align-items: center;

@ -9,11 +9,11 @@
<template v-slot:header>
<div class="reject-header">
<img :src="warnIcon" alt="" />
<span>如果您确定驳回请填写驳回原因</span>
<span>知识驳回</span>
</div>
</template>
<div class="reject-content">
<div class="label">回原因</div>
<div class="label">回原因</div>
<el-input
v-model="reason"
maxlength="200"
@ -22,7 +22,7 @@
show-word-limit
type="textarea"
/>
<div class="footer-btn">
<div class="footer-btn" style="margin-top: 60px">
<div class="cancel_btn" @click="dialogVisible = false">取消</div>
<!-- <div class="determine_btn">确定</div> -->
<el-button
@ -67,6 +67,9 @@ const submit = () => {
};
</script>
<style lang="scss" scoped>
.reject {
background: linear-gradient(180deg, #e1ecfe 0%, #ffffff 30%);
}
.reject-header {
display: flex;
align-items: center;

@ -28,6 +28,7 @@ const seachForm = reactive({
publishDateEnd: "",
submitDateBegin: "",
submitDateEnd: "",
flowType: "",
time: [],
submitDate: []
});
@ -68,10 +69,10 @@ const pagination = reactive({
background: true
});
const columns: TableColumnList = [
{
type: "selection",
width: 55
},
// {
// type: "selection",
// width: 55
// },
{
label: "序号",
type: "index",
@ -80,7 +81,8 @@ const columns: TableColumnList = [
{
label: "知识标题",
prop: "title",
slot: "titleSlot"
slot: "titleSlot",
width: 500
},
{
label: "审核类型",
@ -123,7 +125,7 @@ const columns: TableColumnList = [
{
label: "操作",
fixed: "right",
width: 350,
width: 200,
slot: "operation"
}
];
@ -213,7 +215,8 @@ const getApplicationSubLibrary = async () => {
}
};
const openApproval = row => {
ApprovedRef.value.open(row.knowledgeId, row.todoId);
// ApprovedRef.value.open(row.knowledgeId, row.todoId);
DetailsRef.value.openApproval(row);
};
const openRejectApproval = row => {
RejectApprovalRef.value.open(row.knowledgeId, row.todoId);
@ -257,7 +260,11 @@ onMounted(() => {
<el-row>
<el-col :span="8">
<el-form-item label="知识标题">
<el-input size="large" v-model="seachForm.title" /> </el-form-item
<el-input
size="large"
placeholder="请输入"
v-model="seachForm.title"
/> </el-form-item
></el-col>
<el-col :span="8"
><el-form-item label="发文部门">
@ -319,7 +326,7 @@ onMounted(() => {
style="width: 100%"
size="large"
filterable
v-model="seachForm.baseId"
v-model="seachForm.flowType"
placeholder="请选择"
>
<el-option
@ -333,8 +340,8 @@ onMounted(() => {
<el-col :span="8">
<el-form-item label="发布日期">
<el-date-picker
start-placeholder="开始时间"
end-placeholder="结束时间"
start-placeholder="开始日期"
end-placeholder="结束日期"
format="YYYY-MM-DD"
v-model="seachForm.time"
type="daterange"
@ -410,7 +417,7 @@ onMounted(() => {
</pure-table>
</div>
<TransferRecords ref="TransferRecordRef" />
<Details ref="DetailsRef" />
<Details @getData="search" ref="DetailsRef" />
<Approved @approvalOk="approvalOk" ref="ApprovedRef" />
<RejectApproval
@RejectApprovalOk="RejectApprovalOk"

@ -1,28 +1,33 @@
<script setup lang="ts">
import { ref } from "vue";
import { queryKnowledgeDetail } from "@/api/knowledgeCentre";
import {
processKnowledgeFlow,
queryKnowledgeDetail
} from "@/api/knowledgeCentre";
import { reactive } from "vue";
import Approved from "../approval/compontents/Approved.vue";
import RejectApproval from "../approval/compontents/RejectApproval.vue";
import { message } from "@/utils/message";
defineOptions({
name: "SubmissionDetails"
});
const dialogVisible = ref(false);
const annexList = ref([
{
name: "PDF附件名称显示全部点击下载附件"
}
]);
const isApproval = ref(false);
const ApprovedRef = ref();
const RejectApprovalRef = ref();
const formData = reactive({
knowledge: {
publishDeptId: "",
knowledgeFrom: undefined,
title: ""
},
baseName: "",
submittedDeptName: "",
knowledgeInfo: {
territory: "",
publishDate: "",
autoLoseEffect: undefined,
timeliness: undefined,
execTimeBegin: "",
execTimeEnd: "",
knowledgeTag: "",
@ -34,10 +39,20 @@ const formData = reactive({
},
fileInfoList: []
});
const knowledgeId = ref("");
const todoId = ref("");
defineExpose({
open(val) {
dialogVisible.value = true;
isApproval.value = false;
getDeatils(val);
},
openApproval(row) {
dialogVisible.value = true;
isApproval.value = true;
getDeatils(row.knowledgeId);
knowledgeId.value = row.knowledgeId;
todoId.value = row.todoId;
}
});
const getDeatils = async id => {
@ -61,6 +76,37 @@ const downloadFile = (url, fileName) => {
link.download = fileName;
link.click();
};
const approvalOk = async () => {
const res: any = await processKnowledgeFlow({
operate: 1,
knowledgeId: knowledgeId.value,
todoId: todoId.value
});
if (res.code === 200) {
message("审批成功!", { type: "success" });
dialogVisible.value = false;
emit("getData");
}
};
const RejectApprovalOk = async () => {
const res: any = await processKnowledgeFlow({
operate: 2,
knowledgeId: knowledgeId.value,
todoId: todoId.value
});
if (res.code === 200) {
message("驳回成功!", { type: "success" });
dialogVisible.value = false;
emit("getData");
}
};
const emit = defineEmits(["getData"]);
const openApproval = () => {
ApprovedRef.value.open(knowledgeId.value, todoId.value);
};
const openRejectApproval = () => {
RejectApprovalRef.value.open(knowledgeId.value, todoId.value);
};
const downLoadFile = item => {
downloadFile(
`/know-sub/file/downloadFile?fileId=${item.fileBlobId}`,
@ -90,7 +136,7 @@ const downLoadFile = item => {
<div class="basicInfo">
<div class="basicInfo_title">基本信息</div>
<div class="basicInfo_item">
<span>{{ `发文部门:${formData.knowledge.publishDeptId}` }}</span>
<span>{{ `发文部门:${formData.submittedDeptName}` }}</span>
</div>
<div class="basicInfo_item">
<span v-if="formData.knowledge.knowledgeFrom === 1">{{
@ -107,18 +153,18 @@ const downLoadFile = item => {
}}</span>
</div>
<div
v-if="formData.knowledgeInfo.autoLoseEffect"
v-if="formData.knowledgeInfo.timeliness"
class="basicInfo_item"
>
<span v-if="formData.knowledgeInfo.autoLoseEffect === 1">{{
<span v-if="formData.knowledgeInfo.timeliness === 1">{{
`时效性:长期有效`
}}</span>
<span v-if="formData.knowledgeInfo.autoLoseEffect === 2">{{
<span v-if="formData.knowledgeInfo.timeliness === 2">{{
`时效性:临时有效`
}}</span>
</div>
<div
v-if="formData.knowledgeInfo.autoLoseEffect === 2"
v-if="formData.knowledgeInfo.timeliness === 2"
class="basicInfo_item"
>
<span>{{
@ -130,6 +176,9 @@ const downLoadFile = item => {
`知识标签:${formData.knowledgeInfo.knowledgeTag}`
}}</span>
</div>
<div class="basicInfo_item">
<span>{{ `应用子库:${formData.baseName}` }}</span>
</div>
<div class="basicInfo_item">
<span>{{
`政策类型:${formData.knowledgeInfo.policyType}`
@ -156,8 +205,17 @@ const downLoadFile = item => {
<span class="link">{{ item.fileName }}</span>
</div>
</div>
<div v-if="isApproval" class="btn_list">
<div class="main_btn" @click="openApproval"></div>
<div class="btn" @click="openRejectApproval"></div>
</div>
</div>
</div>
<Approved @approvalOk="approvalOk" ref="ApprovedRef" />
<RejectApproval
@RejectApprovalOk="RejectApprovalOk"
ref="RejectApprovalRef"
/>
</div>
</el-drawer>
</div>
@ -165,7 +223,7 @@ const downLoadFile = item => {
<style lang="scss" scoped>
.submission-details {
padding-left: 16px;
height: 100%;
.header-title {
display: flex;
align-items: center;
@ -194,7 +252,7 @@ const downLoadFile = item => {
}
.main {
display: flex;
height: 100%;
// height: 100%;
.basicInfo {
width: 350px;
padding: 24px 16px;
@ -226,6 +284,8 @@ const downLoadFile = item => {
font-size: 16px;
color: #666666;
margin-top: 32px;
height: calc(100vh - 360px);
overflow: auto;
}
.annex {
margin-top: 75px;
@ -239,6 +299,39 @@ const downLoadFile = item => {
}
}
}
.btn_list {
display: flex;
flex-direction: row-reverse;
margin-top: 40px;
.main_btn {
width: 188px;
height: 40px;
background: #0052d9;
box-shadow: 0px 2px 0px 0px rgba(0, 0, 0, 0.04);
border-radius: 6px 6px 6px 6px;
font-weight: 400;
font-size: 16px;
color: #ffffff;
line-height: 40px;
text-align: center;
cursor: pointer;
}
.btn {
width: 188px;
height: 40px;
background: #ffffff;
box-shadow: 0px 2px 0px 0px rgba(0, 0, 0, 0.04);
border-radius: 6px 6px 6px 6px;
border: 1px solid #0052d9;
font-weight: 400;
font-size: 16px;
color: #0052d9;
line-height: 40px;
text-align: center;
cursor: pointer;
margin-right: 24px;
}
}
}
}
}

@ -22,7 +22,7 @@
show-word-limit
type="textarea"
/>
<div class="footer-btn">
<div class="footer-btn" style="margin-top: 60px">
<div class="cancel_btn" @click="dialogVisible = false">取消</div>
<!-- <div class="determine_btn">确定</div> -->
<el-button
@ -63,6 +63,9 @@ const submit = () => {
};
</script>
<style lang="scss" scoped>
.SubmitReview {
background: linear-gradient(180deg, #e1ecfe 0%, #ffffff 30%);
}
.SubmitReview-header {
display: flex;
align-items: center;
@ -71,6 +74,7 @@ const submit = () => {
border-bottom: 1px solid rgba(91, 139, 255, 0.3);
position: relative;
width: 100%;
span {
font-weight: bold;
font-size: 20px;

@ -42,7 +42,7 @@ const getDetails = async (id, flowInstanceId) => {
<template>
<div>
<el-drawer
:size="900"
:size="650"
append-to-body
v-model="dialogVisible"
:show-close="false"
@ -133,7 +133,7 @@ const getDetails = async (id, flowInstanceId) => {
.line {
position: relative;
left: -20px;
width: 860px;
width: 600px;
height: 1px;
margin: 24px 0;
background: rgb(91 139 255 / 30%);

@ -11,6 +11,7 @@ import backImg from "@/assets/home/back.png";
import { useRouter } from "vue-router";
const router = useRouter();
const ruleFormRef = ref();
const scrollbarRef = ref();
const formData = reactive({
operate: "",
linkList: [
@ -190,7 +191,7 @@ const reset = () => {
refWangEditor.value.initTitle("");
};
const goBack = () => {
router.push("/knowledgeCentre/submission");
scrollbarRef.value.setScrollTop(0);
};
onMounted(() => {
const obj: any = getUserInfo();
@ -200,7 +201,11 @@ onMounted(() => {
<template>
<div class="template-submission">
<el-scrollbar class="main-content" :show-scrollbar="false">
<el-scrollbar
class="main-content"
ref="scrollbarRef"
:show-scrollbar="false"
>
<el-form
ref="ruleFormRef"
:model="formData"

@ -72,6 +72,18 @@ const statusList = [
{
key: 12,
name: "待审批(撤回)"
},
{
name: "驳回(新增)",
key: 15
},
{
name: "驳回(删除)",
key: 16
},
{
name: "驳回(撤回)",
key: 17
}
];
const departmentList = ref([]);
@ -113,10 +125,10 @@ const pagination = reactive({
background: true
});
const columns: TableColumnList = [
{
type: "selection",
width: 55
},
// {
// type: "selection",
// width: 55
// },
{
label: "序号",
type: "index",
@ -125,7 +137,8 @@ const columns: TableColumnList = [
{
label: "知识标题",
prop: "title",
slot: "titleSlot"
slot: "titleSlot",
width: 500
},
{
label: "发文部门",
@ -164,7 +177,7 @@ const columns: TableColumnList = [
{
label: "操作",
fixed: "right",
width: 350,
width: 250,
slot: "operation"
}
];
@ -314,6 +327,7 @@ onMounted(() => {
<el-form-item label="知识标题">
<el-input
style="width: 100%"
placeholder="请输入"
size="large"
v-model="seachForm.title"
/> </el-form-item
@ -375,8 +389,8 @@ onMounted(() => {
<el-form-item label="发布日期">
<el-date-picker
style="width: 100%"
start-placeholder="开始时间"
end-placeholder="结束时间"
start-placeholder="开始日期"
end-placeholder="结束日期"
format="YYYY-MM-DD"
v-model="seachForm.time"
type="daterange"
@ -388,8 +402,8 @@ onMounted(() => {
<el-form-item label="报送日期">
<el-date-picker
style="width: 100%"
start-placeholder="开始时间"
end-placeholder="结束时间"
start-placeholder="开始日期"
end-placeholder="结束日期"
format="YYYY-MM-DD"
v-model="seachForm.submitDate"
type="daterange"

Loading…
Cancel
Save