From fe8ca804522719664951527083f824faacebd78f Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Wed, 24 Jul 2024 00:28:42 +0800
Subject: [PATCH] =?UTF-8?q?feat=20:=20=E9=9C=80=E6=B1=82=E6=B1=87=E6=80=BB?=
 =?UTF-8?q?=E5=B9=B4=E5=BA=A6=E8=AE=A1=E5=88=92=E5=AE=A1=E6=89=B9=E5=89=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=B5=81=E7=A8=8B=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DetailComponent/ApprovalDetail.vue        | 70 +++++++++++++------
 .../DetailComponent/ProjectApply.vue          |  6 +-
 .../implementation/detail.vue                 |  9 +++
 .../process/config/FormAuthorityConfig.vue    |  9 +++
 4 files changed, 72 insertions(+), 22 deletions(-)

diff --git a/src/components/DetailComponent/ApprovalDetail.vue b/src/components/DetailComponent/ApprovalDetail.vue
index a1e271d..5a2a84d 100644
--- a/src/components/DetailComponent/ApprovalDetail.vue
+++ b/src/components/DetailComponent/ApprovalDetail.vue
@@ -145,6 +145,10 @@ const props = defineProps({
     type: String,
     default: 'READ'
   },
+  preProcessShow: {
+    type: String,
+    default: 'READ'
+  },
   // approval 立项, execute 实施, 归档 archivist
   type: {
     type: String,
@@ -220,30 +224,31 @@ const schema = computed(() => {
             </div>
         )
       },
-      {
-        label: '项目立项附件',
-        prop: 'singleFile',
-        colProps: {
-          span: 24
-        },
-        labelWidth:'left',
-        component: () => (
-            <div>
-              {
-                props.formData.singleFile?.originalFileName ?
-                    <span
-                        style={{color: '#409EFF', cursor: 'pointer'}}
-                        onClick={() => handleDownload(props.formData.singleFile)}
-                    >
+    ]
+    arr.push(
+        {
+          label: '项目立项附件',
+          prop: 'singleFile',
+          colProps: {
+            span: 24
+          },
+          labelWidth:'left',
+          component: () => (
+              <div>
+                {
+                  props.formData.singleFile?.originalFileName ?
+                      <span
+                          style={{color: '#409EFF', cursor: 'pointer'}}
+                          onClick={() => handleDownload(props.formData.singleFile)}
+                      >
                 {props.formData.singleFile?.originalFileName}
               </span> :
-                    <span>{'--'}</span>
-              }
-            </div>
+                      <span>{'--'}</span>
+                }
+              </div>
 
-        )
-      },
-    ]
+          )
+        })
   } else if (props.type == 'execute') {
     arr = [
       {
@@ -344,6 +349,29 @@ const schema = computed(() => {
   return arr
 })
 
+const setPreProcess = () => {
+  //preProcessShow 为 EDIT 是 可以选择前置流程
+  let pre = {
+    label: '前置流程',
+    prop: 'preProcess',
+    colProps: {
+      span: 24
+    },
+    labelWidth:'left',
+    component: () => (
+        <div>
+          {
+            props.formData.preProcess ? props.formData.preProcess.map(item => {
+              return <span><a target="_blank" style={{color: '#409EFF', cursor: 'pointer'}}
+                              href={props.formData.preProcessBaseUrl + item.requestId}>{item.requestName}</a> </span>
+            }) : <span>{'--'}</span>
+          }
+        </div>
+    )
+  }
+}
+
+
 const route = useRoute()
 const emit = defineEmits(['update:value'])
 const _value = computed({
diff --git a/src/components/DetailComponent/ProjectApply.vue b/src/components/DetailComponent/ProjectApply.vue
index 8241058..253e260 100644
--- a/src/components/DetailComponent/ProjectApply.vue
+++ b/src/components/DetailComponent/ProjectApply.vue
@@ -59,7 +59,7 @@
                          v-model:value="projectPersonUserList" @ok="projectPersonUserPickerOk"/>
           </el-form-item>
         </el-col>
-        <el-col :span="24">
+        <el-col :span="24" v-if="preProcessShow === 'EDIT'">
           <el-form-item label="前置流程" :required="preProcessRequired" prop="preProcess" label-width="125">
             <el-button color="#DED0B2" @click="handleShowPreTable" style="margin-right: 10px">
               {{
@@ -250,6 +250,10 @@ const props = defineProps({
   step: {
     type: String,
     default: "20"
+  },
+  preProcessShow: {
+    type: String,
+    default: "READ"
   }
 })
 const preProcessList = ref([])
diff --git a/src/views/project-management/implementation/detail.vue b/src/views/project-management/implementation/detail.vue
index 1e5965e..ce570b1 100644
--- a/src/views/project-management/implementation/detail.vue
+++ b/src/views/project-management/implementation/detail.vue
@@ -21,6 +21,7 @@
                       :data="detailData"
                       :processViewer="commonProvessViewer"
                       :fileListShow="fileListShow"
+                      :preProcessShow="preProcessShow"
                       v-model:value="auditOpinion"/>
       <ApprovalDetail type="execute"
                       v-if="showActive == '40'&&!editShow"
@@ -28,6 +29,7 @@
                       :data="detailData"
                       :processViewer="commonProvessViewer"
                       :fileListShow="fileListShow"
+                      :preProcessShow="preProcessShow"
                       v-model:value="auditOpinion"/>
       <ApprovalDetail type="archivist"
                       v-if="showActive == '50'&&!editShow"
@@ -35,12 +37,14 @@
                       :data="detailData"
                       :processViewer="commonProvessViewer"
                       :fileListShow="fileListShow"
+                      :preProcessShow="preProcessShow"
                       v-model:value="auditOpinion"/>
       <project-apply :title="applyTitle"
                      v-if="editShow"
                      :mode="mode"
                      :step="showActive"
                      :data="detailData"
+                     :preProcessShow="preProcessShow"
                      :formData="detailData.formData"/>
     </template>
   </steps>
@@ -64,6 +68,7 @@ const applyTitle = ref('filing')
 const loading = ref(false)
 const processStore = useProcessStore()
 const fileListShow = ref('READ')
+const preProcessShow = ref('READ')
 const mode = ref('')
 const currentStep = ref()
 const auditOpinion = ref('')
@@ -89,6 +94,7 @@ const getAllInfo = async (state) => {
   try {
     detailShow.value = false
     fileListShow.value = 'READ'
+    preProcessShow.value = 'READ'
     commonProvessViewer.value = false
     const {data, code, msg} = await getMapProjectStateInfo(route.query.projectId, state)
     if (code === 1000) {
@@ -108,6 +114,9 @@ const getAllInfo = async (state) => {
         if (data.formPermMap && data.formPermMap["fileList"]) {
           fileListShow.value = data.formPermMap["fileList"].perm
         }
+        if (data.formPermMap && data.formPermMap["preProcess"]) {
+          preProcessShow.value = data.formPermMap["preProcess"].perm
+        }
       })
       changeModel(state, mode.value)
       loading.close()
diff --git a/src/views/workflow/process/config/FormAuthorityConfig.vue b/src/views/workflow/process/config/FormAuthorityConfig.vue
index 97dd8f2..a29044b 100644
--- a/src/views/workflow/process/config/FormAuthorityConfig.vue
+++ b/src/views/workflow/process/config/FormAuthorityConfig.vue
@@ -99,6 +99,15 @@ const formPermsLoadMosr = (oldPermMap, perms) => {
           perm: nowNode.value.type === "ROOT" ? "E" : "R"
         });
       }
+      if (perm.id === 'preProcess'){
+        formPerms.value.push({
+          id: perm.id, //todo ,id 就是字段名称
+          title: perm.title,
+          required: perm.required,
+          perm: 'H'
+        });
+      }
+
     }
   })
 }