Merge branch 'prod' into develop

src/layout/top.vue

@@ -72,8 +72,8 @@
                   <el-dropdown-item
                     command="manage"
                     v-if="permission.vaildPermission('user_manger')"
-                    >用户管理</el-dropdown-item
-                  >
+                    >用户管理
+                  </el-dropdown-item>
                   <el-dropdown-item command="logout">退出登录</el-dropdown-item>
                 </el-dropdown-menu>
               </template>

src/views/contract/component/info2.vue

@@ -10,6 +10,7 @@
         ref="crud"
         v-model="form"
         :before-open="beforeOpen"
+        :before-close="beforeClose"
         @row-del="rowDel"
         @row-save="handleRowSave"
         @row-update="rowUpdate"
@@ -34,10 +35,10 @@
                 form.accountInformationFileList.length === 0
               "
             >
-              <filepicker :project-id="info.projectId" />
+              <filepicker :project-id="info.projectId" @submit="uploadSucc" />
               <div>
                 <div v-for="item in fileList" :key="item.id">
-                  {{ item.originalFileName }}
+                  {{ item.title }}
                 </div>
               </div>
             </div>
@@ -53,6 +54,9 @@
           </div>
           <div v-else>
             <filepicker :project-id="info.projectId" @submit="uploadSucc" />
+            <div v-for="item in fileList" :key="item.id">
+              {{ item.title }}
+            </div>
             <div>
               <div v-for="item in fileList" :key="item.id">
                 {{ item.originalFileName }}
@@ -100,7 +104,6 @@ export default {
         size: 'mini',
         addBtn: true,
         editBtn: true,
-        editBtnText: '支付凭证',
         viewBtn: true,
         delBtn: true,
         refreshBtn: false,
@@ -232,11 +235,19 @@ export default {
       if (type === 'view') {
         done()
       } else if (type === 'edit') {
+        this.form.fileIds = this.form.accountInformationFileList
+          .map(ele => ele.fileFolderId)
+          .join(',')
         done()
       } else {
         done()
       }
     },
+    beforeClose(done, type) {
+      this.$refs.crud.resetFields
+      this.fileList.length = 0
+      done()
+    },
     previewFile(item) {
       if (api.offices.includes(item.suffix)) {
         const routeData = this.$router.resolve({
@@ -255,7 +266,6 @@ export default {
         type: 'warning'
       }).then(res => {
         if (res === 'confirm') {
-          console.log(item)
           this.$api.contract.voucherDel({ ids: item.id }).then(res => {
             if (res.code === 200) {
               this.form.accountInformationFileList =
@@ -325,7 +335,6 @@ export default {
     },
     uploadSucc(list) {
       this.fileList = this.fileList.concat(list)
-      console.log(this.fileList)
       this.form.fileIds = this.fileList.map(ele => ele.id).join(',')
     }
   }