diff --git a/src/views/knowledgeCentre/approval/index.vue b/src/views/knowledgeCentre/approval/index.vue
index 156d22f..46afedf 100644
--- a/src/views/knowledgeCentre/approval/index.vue
+++ b/src/views/knowledgeCentre/approval/index.vue
@@ -21,6 +21,7 @@ const loading = ref(false);
const seachForm = reactive({
title: "",
submittedDeptId: "",
+ publishDeptId: "",
processStatus: "1",
baseId: "",
publishDateBegin: "",
@@ -120,11 +121,7 @@ const columns: TableColumnList = [
}
];
const router = useRouter();
-const dataList = ref([
- {
- title: "企业职工退休网上办理"
- }
-]);
+const dataList = ref([]);
const getData = async () => {
if (seachForm.time && seachForm.time.length > 0) {
seachForm.publishDateBegin = seachForm.time[0];
@@ -159,23 +156,25 @@ const search = () => {
const reset = () => {
clearObject(seachForm);
+ seachForm.processStatus = "1";
search();
};
-const handleCommand = command => {
- console.log("Command", command);
-};
+// const handleCommand = command => {
+// console.log("Command", command);
+// };
const changeStatus = item => {
seachForm.processStatus = item.id;
search();
};
-const add = () => {
- router.push("/knowledgeCentre/addSubmission");
-};
const openRecords = row => {
- TransferRecordRef.value.open(row.id, row.title);
+ if (seachForm.processStatus === "1") {
+ TransferRecordRef.value.open(row.knowledgeId, row.title);
+ } else {
+ TransferRecordRef.value.openApproval(row);
+ }
};
const openDetails = row => {
- DetailsRef.value.open(row);
+ DetailsRef.value.open(row.knowledgeId);
};
const getDepartmentList = async () => {
const res: any = await queryDeptManageList({
@@ -247,12 +246,12 @@ onMounted(() => {
+ >
{
/>
+
{
>
+
+
+
+
{
@page-current-change="handleCurrentChange"
>
-
+
审批
-
+
驳回
diff --git a/src/views/knowledgeCentre/compontents/TransferRecords.vue b/src/views/knowledgeCentre/compontents/TransferRecords.vue
index 08cf247..c42e2d2 100644
--- a/src/views/knowledgeCentre/compontents/TransferRecords.vue
+++ b/src/views/knowledgeCentre/compontents/TransferRecords.vue
@@ -12,7 +12,12 @@ defineExpose({
open(id, name) {
dialogVisible.value = true;
title.value = name;
- getDetails(id);
+ getDetails(id, undefined);
+ },
+ openApproval(row) {
+ dialogVisible.value = true;
+ title.value = row.title;
+ getDetails(row.knowledgeId, row.flowId);
}
});
@@ -25,9 +30,10 @@ const getStatusColor = index => {
borderColor: colorList[index]
};
};
-const getDetails = async id => {
+const getDetails = async (id, flowId) => {
const res: any = await queryKnowledgeFlowRecord({
- knowledgeId: id
+ knowledgeId: id,
+ flowId
});
recordList.value = res.data;
};
diff --git a/src/views/knowledgeCentre/submission/MainTemplate.vue b/src/views/knowledgeCentre/submission/MainTemplate.vue
index 472bdad..851ad09 100644
--- a/src/views/knowledgeCentre/submission/MainTemplate.vue
+++ b/src/views/knowledgeCentre/submission/MainTemplate.vue
@@ -54,7 +54,15 @@ defineExpose({
const { baseId, excerpt, publishDeptId } = data.knowledge;
const obj = {
operate: "",
- linkList: data.knowledgeLinkList,
+ linkList:
+ data.knowledgeLinkList.length > 0
+ ? data.knowledgeLinkList
+ : [
+ {
+ linkName: "",
+ linkUrl: ""
+ }
+ ],
baseId,
execTime: [
data.knowledgeInfo.execTimeBegin,
diff --git a/src/views/knowledgeCentre/submission/add/index.vue b/src/views/knowledgeCentre/submission/add/index.vue
index ebe605f..ed59625 100644
--- a/src/views/knowledgeCentre/submission/add/index.vue
+++ b/src/views/knowledgeCentre/submission/add/index.vue
@@ -34,6 +34,7 @@ const submitOk = async val => {
$router: router,
$route: route
});
+ router.push("/knowledgeCentre/submission");
}
};
diff --git a/src/views/knowledgeCentre/submission/edit/index.vue b/src/views/knowledgeCentre/submission/edit/index.vue
index 181736f..5955e85 100644
--- a/src/views/knowledgeCentre/submission/edit/index.vue
+++ b/src/views/knowledgeCentre/submission/edit/index.vue
@@ -35,6 +35,7 @@ const submitOk = async val => {
$router: router,
$route: route
});
+ router.push("/knowledgeCentre/submission");
}
};
const getDeatils = async () => {