scorpio %!s(int64=2) %!d(string=hai) anos
pai
achega
39f80c1414

+ 1 - 1
src/components/file-way/index.vue

@@ -67,7 +67,7 @@ export default {
         this.data = this.list[this.list.length - 1]
         this.$emit('before', this.data)
       } else {
-        this.$emit('goHome')
+        this.goHome()
       }
     }
   }

+ 11 - 4
src/components/filepicker/index.vue

@@ -73,7 +73,10 @@
                 @before="goBefore"
                 @goHome="getFolderList"
               />
-              <div class="tips" v-else>
+              <div class="tips flex flex-center flex-justify-start" v-else>
+                <el-icon class="mr-10" color="#409eff" :size="20"
+                  ><WarningFilled
+                /></el-icon>
                 {{ tips }}
               </div>
             </div>
@@ -205,11 +208,13 @@ export default {
       } else if (this.activeName === '3') {
         this.isLatest = ''
         this.dictKey = 1
+        this.tips = '该项目的相关要件'
         this.fetchData()
       } else {
         this.isLatest = this.activeName
         this.isLatest = ''
         this.dictKey = 2
+        this.tips = '该项目的相关合同'
         this.fetchData()
       }
     },
@@ -233,6 +238,7 @@ export default {
      * 获取全部文件
      */
     getFolderList() {
+      console.log('dddddd')
       this.loading = true
       const row = {
         stageId: this.stageId,
@@ -348,9 +354,10 @@ export default {
 
 .tips {
   width: 100%;
-  height: 32px;
-  padding: 8px 5px;
-  background-color: bisque;
+  height: 22px;
+  padding: 5px 5px;
+  border-radius: 4px;
+  background-color: #e2eaf5;
 }
 
 .files {

+ 20 - 0
src/views/resource/component/archives.vue

@@ -0,0 +1,20 @@
+<template>
+  <div>
+    <el-button type="primary" text @click="show = true">归档</el-button>
+    <el-dialog v-model="show">
+      <div>dd</div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      show: false
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped></style>

+ 9 - 4
src/views/resource/component/xtable.vue

@@ -36,9 +36,12 @@
               style="width: 280px"
             >
               <el-button type="primary" size="small" text>查看</el-button>
-              <el-button type="primary" size="small" text>归档</el-button>
-              <el-button type="primary" size="small" text>重命名</el-button>
-              <move />
+              <el-button v-if="row.type === 2" type="primary" size="small" text
+                >重命名</el-button
+              >
+              <archives v-if="row.type === 2" />
+              <move v-if="row.type === 1" />
+              <slot name="menu"></slot>
             </div>
             <div
               v-else
@@ -77,11 +80,13 @@
 <script>
 import row1 from '@/views/resource/component/row1.vue'
 import move from '@/views/resource/component/move.vue'
+import archives from '@/views/resource/component/archives.vue'
 
 export default {
   components: {
     row1,
-    move
+    move,
+    archives
   },
   props: {
     total: {

+ 7 - 1
src/views/resource/index.vue

@@ -29,7 +29,13 @@
       <div>
         <div class="full-width flex flex-center flex-justify-between">
           <div class="full-width flex flex-justify-start flex-center">
-            <upload-file v-if="!top" @on-success="uploadSuccess" />
+            <upload-file
+              v-if="!top"
+              @on-success="uploadSuccess"
+              :project-id="folderInfo.projectId"
+              :stage-id="folderInfo.stageId"
+              :parent-id="currentFolder !== null ? currentFolder.id : ''"
+            />
             <el-button
               class="ml-10"
               type="primary"