合并分支 'zax' 到 'master'

src/components/projectManagement/document/document.vue

@@ -78,17 +78,19 @@
 <script>
 export default {
     name: 'document',
+    props: ['value'],
     data () {
         return {
             searchVal: '',
             allData: [{name:'1',roleName: '123',unitName: '1',number: '1'}],
             currentPage: 1, // 分页第一页
             pageSize: 8,  // 每页个数
-            totleLength: 0, // 获取后台传的所有数据的长度
+            totalLength: 0, // 获取后台传的所有数据的长度
         }
     },
     mounted() {
         this.search();
+        console.log(this.$store.getters.getUserData)
     },
     methods: {
         // 查询
@@ -96,10 +98,14 @@ export default {
             let data = {
                 page: this.currentPage,
                 pageSize: this.pageSize,
-                t: {}
+                t: {
+                    projectId: this.value.id
+                }
             }
             this.$server.postFileSearch(data).then(res => {
-                console.log(res)
+                console.log(res.data.data.rows)
+                this.totalLength = res.data.data.total;
+                this.allData = res.data.data.rows;
             })
         },
         // 点击分页
@@ -111,7 +117,17 @@ export default {
             // console.log(`当前页: ${val}`);
             this.currentPage = val;
         },
-        uploadFile(file) {}
+        uploadFile(file) {
+            let formdata = new FormData();
+            formdata.append('file', file);
+            let data = {
+                id: this.value.id,
+                value: formdata
+            }
+            this.$server.postFileUpload(this.value.id).then(res => {
+                console.log(res)
+            })
+        }
     }
 }
 </script>

src/services/server.js

@@ -153,7 +153,7 @@ const server = {
             method: 'get'
         });
     },
-    postProduceUpload(data) { // 单位导入
+    postProduceUpload(data) { // 产品导入
         return axios('/produce/upload', {
             method: 'post',
             data: data,