Merge pull request 'fix : 修复项目归档切换问题' (#623) from dd into master

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/623

src/components/DetailComponent/ApprovalDetail.vue

@@ -20,7 +20,7 @@
         </el-form-item>
       </el-form>
       <fvTable style="width: 100%;min-height:162px;max-height: 162px" v-if="showAttachmentTable" height="162"
-               :tableConfig="tableConfig"
+               :tableConfig="executeTableConfig"
                :data="otherAttachmentList" :isSettingCol="false" :pagination="false">
         <template #empty>
           <el-empty :image-size="55" description="暂无数据" style="padding: 0"/>
@@ -85,7 +85,7 @@ const uploadState = ref(false)
 const showAttachmentTable = ref(true)
 const otherAttachmentList = ref([])
 
-const tableConfig = reactive({
+const executeTableConfig = reactive({
   columns: [
     {
       prop: 'index',
@@ -98,6 +98,7 @@ const tableConfig = reactive({
       prop: 'originalFileName',
       label: '文件名',
       align: 'center',
+      currentRender: ({row, index}) => (<div style="color: #2a99ff;cursor: pointer;" onClick={()=>clickToPreview(row)}>{row.originalFileName}</div>)
     },
     {
       prop: 'tag',
@@ -319,10 +320,11 @@ const schema = computed(() => {
       labelWidth: 'left',
       component: () => {
         let singleFileArray = [props.formData.singleFile]
-        return <fvTable style="width: 100%;max-height: 80px;" height="80"
-                        tableConfig={editSingleTableConfig}
-                        data={singleFileArray} isSettingCol={false} pagination={false}>
-        </fvTable>
+        return props.formData.singleFile ? <fvTable style="width: 100%;max-height: 80px;" height="80"
+                                                    tableConfig={editSingleTableConfig}
+                                                    data={singleFileArray} isSettingCol={false} pagination={false}>
+            </fvTable>
+            : <span>--</span>
       }
     })
   } else if (props.type == 'execute') {
@@ -354,10 +356,11 @@ const schema = computed(() => {
       labelWidth: 'left',
       component: () => {
         let singleFileArray = [props.formData.singleFile]
-        return <fvTable style="width: 100%;max-height: 80px;" height="80"
-                        tableConfig={editSingleTableConfig}
-                        data={singleFileArray} isSettingCol={false} pagination={false}>
-        </fvTable>
+        return props.formData.singleFile ? <fvTable style="width: 100%;max-height: 80px;" height="80"
+                                                    tableConfig={editSingleTableConfig}
+                                                    data={singleFileArray} isSettingCol={false} pagination={false}>
+            </fvTable>
+            : <span>--</span>
       }
     })
   } else if (props.type == 'archivist') {
@@ -371,10 +374,11 @@ const schema = computed(() => {
         labelWidth: 'left',
         component: () => {
           let singleFileArray = [props.formData.singleFile]
-          return <fvTable style="width: 100%;max-height: 80px;" height="80"
-                          tableConfig={editSingleTableConfig}
-                          data={singleFileArray} isSettingCol={false} pagination={false}>
-          </fvTable>
+          return props.formData.singleFile ? <fvTable style="width: 100%;max-height: 80px;" height="80"
+                                                      tableConfig={editSingleTableConfig}
+                                                      data={singleFileArray} isSettingCol={false} pagination={false}>
+              </fvTable>
+              : <span>--</span>
         }
       },
     ]
@@ -389,10 +393,11 @@ const schema = computed(() => {
         labelWidth: 'left',
         component: () => {
           let singleFileArray = [props.formData.singleFile]
-          return <fvTable style="width: 100%;max-height: 80px;" height="80"
-                          tableConfig={editSingleTableConfig}
-                          data={singleFileArray} isSettingCol={false} pagination={false}>
-          </fvTable>
+          return props.formData.singleFile ? <fvTable style="width: 100%;max-height: 80px;" height="80"
+                                                      tableConfig={editSingleTableConfig}
+                                                      data={singleFileArray} isSettingCol={false} pagination={false}>
+              </fvTable>
+              : <span>--</span>
         }
       },
     ]

src/components/DetailComponent/ProjectApply.vue

@@ -66,9 +66,9 @@
                 localFormData.preProcess && localFormData.preProcess.length > 0 ? '更改' : sessionParams.preProcess && sessionParams.preProcess.length > 0 ? '更改' : '请选择'
               }}
             </el-button>
-            <div v-for="item in getRequestName(localFormData.preProcess)" :key="item.requestId">
+            <div v-for="(item,index) in getRequestName(localFormData.preProcess)" :key="item.requestId">
               <a :href="item.baseUrl" target="_blank"
-                 style="color: #2a99ff;margin-right: 10px;cursor: pointer">{{ item.requestName }}
+                 style="color: #2a99ff;cursor: pointer">{{ item.requestName }}<span v-if="index != localFormData.preProcess.length -1">，</span>
               </a>
             </div>
           </el-form-item>
@@ -106,6 +106,9 @@
       <el-button color="#DED0B2" v-else-if="mode === 'resubmit'" @click="handleSubmit">重新提交</el-button>
       <el-button @click="handleBack">返回</el-button>
     </div>
+
+    <file-preview ref="filePreviewRef" v-if="filePreviewShow" :fileName="filePreviewParam.fileName" :fileUrl="filePreviewParam.fileUrl"
+                  :fileType="filePreviewParam.fileType"/>
     <el-dialog v-if="showPreTable" title="前置流程" v-model="showPreTable" width="80%">
       <el-form :model="preProcessForm" inline @submit.prevent="searchPreProcess">
         <el-form-item label="请求名称">
@@ -198,7 +201,7 @@ const tableConfig = reactive({
       prop: 'originalFileName',
       label: '文件名',
       align: 'center',
-      // currentRender: ({row, index}) => (<div style="color: #2a99ff;cursor: pointer;" onClick={()=>clickToPreview(row)}>{row.originalFileName}</div>)
+      currentRender: ({row, index}) => (<div style="color: #2a99ff;cursor: pointer;" onClick={()=>clickToPreview(row)}>{row.originalFileName}</div>)
     },
     {
       prop: 'tag',
@@ -301,7 +304,23 @@ const selectRows = ref([])
 const projectId = ref(route.query.projectId)
 const sessionParams = ref({})
 
-
+const filePreviewParam = ref({
+  fileUrl: '',
+  fileName: '',
+  fileType: 'pdf'
+})
+const filePreviewShow = ref(false)
+const clickToPreview=(row)=>{
+  filePreviewShow.value = false
+  filePreviewParam.value = {
+    fileUrl: row.url,
+    fileName: row.originalFileName,
+    fileType: row.fileType
+  }
+  nextTick(()=>{
+    filePreviewShow.value = true
+  })
+}
 
 const getProjectPerson = (list) => {
   if (!list || list && list.length === 0) {