Merge branch 'dev' of http://1.116.113.26:8088/zhuliu/RMS-FrontEnd into dev

RMS-FrontEnd/src/views/components/common/menu/index.vue

@@ -10,15 +10,14 @@
         <ul class="menu-list" >
             <li @click="downLoad(data)"><i class="fa el-icon-download"></i><span>下载</span></li>
             <li @click="preview(data)"><i class="fa el-icon-view"></i><span>预览</span></li>
-            <li @click="delFile(data)"><i class="fa el-icon-delete"></i><span>删除</span></li>
+            <li @click="delFile(data)" v-if="!isDelete"><i class="fa el-icon-delete"></i><span>删除</span></li>
         </ul>
     </div>
 </template>
 <script>
-
 import {File} from './mixins'
 export default {
-    props:['data'],
+    props:['data','isDelete'],
     mixins:[File],
     data() {
         return {

RMS-FrontEnd/src/views/task/MyHandle.vue

@@ -136,7 +136,11 @@
                 </el-form-item>
                 <el-form-item label="附件：">
                   <div v-if="form.reportFiles" class="upload-file">
-                      <div v-for="item in form.reportFiles" style="margin:0;display:flex;justify-content:space-around;"><p style="margin:0;width:calc(100% - 40px);overflow: hidden;white-space: nowrap;text-overflow:ellipsis">{{item.name?item.name:item.fileName}}</p> <p style="margin:0;" @click="delFile(item.id)"><i class="el-icon-close"></i></p></div>
+					<div v-for="item in form.reportFiles" style="margin:0;display:flex;justify-content:space-around;align-items:center;">
+                      <p style="margin:0;width:calc(100% - 40px);overflow: hidden;white-space: nowrap;text-overflow:ellipsis;cursor: pointer">{{item.name?item.name+'.'+item.suffix:item.fileName}}</p> 
+                      <Menu :data="item" :isDelete="true"></Menu>
+                    </div>
+                      <!-- <div v-for="item in form.reportFiles" style="margin:0;display:flex;justify-content:space-around;"><p style="margin:0;width:calc(100% - 40px);overflow: hidden;white-space: nowrap;text-overflow:ellipsis">{{item.name?item.name:item.fileName}}</p> <p style="margin:0;" @click="delFile(item.id)"><i class="el-icon-close"></i></p></div> -->
                   </div>
                   <!-- <el-upload  ref="upload" class="upload-file" drag action="#" :auto-upload="false" :show-file-list="true" :on-change="onChange" multiple   :on-preview="handlePreview" :on-remove="handleRemove">
                       <i :class="!file ? 'el-icon-upload' : 'el-icon-refresh'"></i>
@@ -184,7 +188,11 @@
 </template>
   
 <script>
+import Menu from '@/views/components/common/menu/index.vue'
   export default {
+	components:{
+		Menu
+	},
 	props:['activeName','reportType','status'],
 	data() {
 	  return {