2022-8-2

src/SManagement/archives/components/FileList.vue

@@ -16,7 +16,7 @@
         </el-image>
       </div>
       <p>{{item.document}}</p>
-      <div class="icon" v-show="item.fileType != 'folder' && isCollect == true && isIconShowIndex === index || $route.path == '/archivesmag_list'">
+      <div class="icon" v-show="item.fileType != 'folder' && isCollect == true && isIconShowIndex === index || $route.path == '/archivesmag_list' || item.isCollect == 1">
         <img
           src="@/assets/file_icons/收藏.png"
           alt
@@ -80,7 +80,10 @@ export default {
   computed: {},
   watch: {},
   created() {
-
+    setTimeout(() => {
+      console.log(this.fileData);
+      
+    },2000)
   },
   methods: {
     //文件单击事件

src/SManagement/archives_upload/index.vue

@@ -193,6 +193,8 @@ export default {
 
     //文件上传成功
     async onSuccess(id) {
+      console.log(id);
+      
       let param = {
         "classname": "system.attachment.Attachment",
         "method": "createFileLink",

src/SManagement/user/team-manage/components/AddUser.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog title="新建" :visible.sync="dialogVisible" :before-close="handleClose" v-if="tool.checkAuth($route.name,'read')">
+  <el-dialog :title="editTarget ? '编辑' : '新建'" :visible.sync="dialogVisible" :before-close="handleClose" v-if="tool.checkAuth($route.name,'read')">
     <el-row :gutter="30">
       <el-form ref="formInfo" :model="param.content" :rules="rules" label-width="102px" label-position="left">
         <el-col :span="12">
@@ -61,7 +61,7 @@ export default {
               "phonenumber": "",
               "position": "",
               "email":"",
-              "remarks": "备注",
+              "remarks": "",
               "roleids":[]
           }
       },
@@ -93,13 +93,38 @@ export default {
   watch: {
     editTarget: {
       handler(val) {
-        this.$refs.formInfo.clearValidate()
-        this.param.content.name = val.name
-        this.param.content.position = val.position
-        this.param.content.phonenumber = val.phonenumber
-        this.param.content.roleids = val.roleids ? val.roleids.map((item) => item) : []
-        this.param.content.sa_agent_hrid = val.sa_agent_hrid
-        this.param.content.email = val.email
+        this.$nextTick(() => {
+          this.$refs.formInfo.clearValidate()
+          this.param.content.name = val.name
+          this.param.content.position = val.position
+          this.param.content.phonenumber = val.phonenumber
+          this.param.content.roleids = val.roleids ? val.roleids.map((item) => item) : []
+          this.param.content.sa_agent_hrid = val.sa_agent_hrid
+          this.param.content.email = val.email
+        })
+        console.log(this.param);
+        
+      }
+    },
+    dialogVisible: {
+      handler(val) {
+        if(!val) {
+          this.param = {
+            "classname": "sale.team.team",
+            "method": "insertormodify_team",
+            "content": {
+                "sa_agent_hrid": 0,
+                "name": "",
+                "phonenumber": "",
+                "position": "",
+                "email":"",
+                "remarks": "",
+                "roleids":[]
+            }
+          }
+          console.log(this.param);
+          
+        }
       }
     }
   },

src/components/file-block/index.vue

@@ -63,7 +63,7 @@ export default {
     },
     //预览
     seeClick(item) {
-      if(item.fileType == 'image' || item.fileType == 'pdf' || item.fileType == 'video') {
+      if(item.fileType == 'image' || item.fileType == 'video') {
         this.seeFile = item
         this.$refs.seeFile.dialogVisible = true
       } else {

src/utils/matchingFeilType.js

@@ -5,9 +5,9 @@ export default {
             video: ['mp4', 'ogg', 'webm'],
             word: ['doc', 'docx'],
             excel: ['xls', 'xlsx'],
-            ppt: ['ppt', 'pptx'],
+            PPT: ['ppt', 'pptx'],
             txt: ['txt', 'md', 'js', 'json'],
-            pdf: ['pdf'],
+            PDF: ['pdf'],
             rar: ['7z', 'zip', 'rar', 'kz', 'ace', 'arj', 'bz2', 'cab', 'gz', 'iso', 'jar', 'lzh', 'tar', 'z'],
             folder: ['"folder"']
         },