Browse Source

Merge remote-tracking branch 'origin/master'

lizhenhao 2 years atrás
parent
commit
4b2fc1732a
1 changed files with 5 additions and 3 deletions
  1. 5 3
      src/views/modules/sys/project/AssessForm.vue

+ 5 - 3
src/views/modules/sys/project/AssessForm.vue

@@ -295,7 +295,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-
           <el-upload ref="upload" style="display: inline-block; margin-left: 5em; :show-header='status'" action=""
                      :limit="999" :http-request="httpRequest"
                      multiple
@@ -308,13 +307,13 @@
                      :file-list="filesArra2">
             <el-button type="info" size="mini">点击上传</el-button>
           </el-upload>
-
+          <div style="height: calc(100% - 80px);">
           <vxe-table
             style="margin-left: 5em"
             border="inner"
             auto-resize
             resizable
-            height="auto"
+            height="500px"
             :loading="loading"
             size="small"
             ref="projectTable"
@@ -342,6 +341,7 @@
               </template>
             </vxe-column>
           </vxe-table>
+          </div>
 
         </el-row>
       </el-form>
@@ -441,6 +441,8 @@
         this.showViewer = false
       },
       init (method, id) {
+        this.dataList = []
+        this.dataListNew = []
         this.ossService.findFileList(id).then(({data}) => {
           data.forEach((item) => {
             item.name = item.attachmentName