From a8d61e10b6abe80b2ab72d845b39744b4510d467 Mon Sep 17 00:00:00 2001
From: xiangcongshuai <xiangcongshuai@supervision.ltd>
Date: Thu, 4 Jul 2024 09:08:48 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/knowledgeCentre/approval/index.vue  | 61 +++++++++++++------
 .../compontents/TransferRecords.vue           | 12 +++-
 .../submission/MainTemplate.vue               | 10 ++-
 .../knowledgeCentre/submission/add/index.vue  |  1 +
 .../knowledgeCentre/submission/edit/index.vue |  1 +
 5 files changed, 64 insertions(+), 21 deletions(-)

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(() => {
               <el-input size="large" v-model="seachForm.title" /> </el-form-item
           ></el-col>
           <el-col :span="8"
-            ><el-form-item label="报送人部门">
+            ><el-form-item label="发文部门">
               <el-select
                 size="large"
                 style="width: 100%"
                 filterable
-                v-model="seachForm.submittedDeptId"
+                v-model="seachForm.publishDeptId"
                 placeholder="请选择"
               >
                 <el-option
@@ -263,6 +262,7 @@ onMounted(() => {
                 />
               </el-select> </el-form-item
           ></el-col>
+
           <el-col :span="8"
             ><el-form-item label="应用子库">
               <el-select
@@ -282,6 +282,23 @@ onMounted(() => {
           ></el-col>
         </el-row>
         <el-row>
+          <el-col :span="8"
+            ><el-form-item label="报送人部门">
+              <el-select
+                size="large"
+                style="width: 100%"
+                filterable
+                v-model="seachForm.submittedDeptId"
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in departmentList"
+                  :key="item.id"
+                  :label="item.deptName"
+                  :value="item.id"
+                />
+              </el-select> </el-form-item
+          ></el-col>
           <el-col :span="8"
             ><el-form-item label="审核类型">
               <el-select
@@ -351,10 +368,20 @@ onMounted(() => {
         @page-current-change="handleCurrentChange"
       >
         <template #operation="{ row }">
-          <el-button link type="primary" @click="openApproval(row)">
+          <el-button
+            v-if="seachForm.processStatus === '1'"
+            link
+            type="primary"
+            @click="openApproval(row)"
+          >
             审批
           </el-button>
-          <el-button link type="primary" @click="openRejectApproval(row)">
+          <el-button
+            v-if="seachForm.processStatus === '1'"
+            link
+            type="primary"
+            @click="openRejectApproval(row)"
+          >
             驳回
           </el-button>
           <el-button link type="primary" @click="openRecords(row)">
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");
   }
 };
 </script>
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 () => {