Merge remote-tracking branch 'origin/master'

src/views/modules/sys/project/AssessForm.vue

@@ -305,7 +305,7 @@
                      :show-file-list="false"
                      :on-change="changes"
                      :file-list="filesArra2">
-            <el-button type="info" size="mini" v-if="inputForm.permissionFlag">点击上传</el-button>
+            <el-button type="info" size="mini" v-if="inputForm.permissionFlag&&showVi">点击上传</el-button>
           </el-upload>
           <div style="height: calc(100% - 80px);margin-top: 30px">
           <vxe-table
@@ -347,8 +347,8 @@
 <!--            <vxe-column title="文件描述" field="description"></vxe-column>-->
             <vxe-column title="操作" width="200px" fixed="right" align="center">
               <template  slot-scope="scope">
-                <el-button type="text"  icon="el-icon-delete" size="small" v-if="inputForm.permissionFlag" @click="deleteMsgById(scope.row, scope.$rowIndex)">删除</el-button>
-                <el-button type="text"  icon="el-icon-edit" size="small" @click="toHref(scope.row)">下载</el-button>
+                <el-button type="text"  icon="el-icon-delete" size="small" v-if="inputForm.permissionFlag&&showVi" @click="deleteMsgById(scope.row, scope.$rowIndex)">删除</el-button>
+                <el-button type="text"  icon="el-icon-edit" size="small" @click="toHref(scope.row)" :disabled="none">下载</el-button>
               </template>
             </vxe-column>
           </vxe-table>
@@ -437,7 +437,8 @@
         showViewer: false, // 显示查看器
         url: '',
         rowurl: '',
-        src: ''
+        src: '',
+        showVi: true
       }
     },
     components: { ElImageViewer },
@@ -572,6 +573,7 @@
         } else if (method === 'edit') {
           this.title = '修改项目信息'
         } else if (method === 'view') {
+          this.showVi = false
           this.title = '查看项目详情'
         }
         this.visible = true
@@ -626,6 +628,7 @@
       close () {
         this.$refs.inputForm.resetFields()
         this.visible = false
+        this.showVi = true
       },
       httpRequest (file) {
         httpRequest(file, fileName(file), 'projectRecords')

src/views/modules/sys/project/ConsultationForm.vue

@@ -307,7 +307,7 @@
                    :show-file-list="false"
                    :on-change="changes"
                    :file-list="filesArra2">
-          <el-button type="info" size="mini" v-if="inputForm.permissionFlag">点击上传</el-button>
+          <el-button type="info" size="mini" v-if="inputForm.permissionFlag&&showVi" >点击上传</el-button>
         </el-upload>
         <div style="height: calc(100% - 80px);margin-top: 30px">
           <vxe-table
@@ -350,7 +350,7 @@
             <vxe-column title="操作" width="200px" fixed="right" align="center">
               <template  slot-scope="scope">
                 <el-button type="text"  icon="el-icon-edit" size="small" @click="toHref(scope.row)">下载</el-button>
-                <el-button type="text"  icon="el-icon-delete" size="small" v-if="inputForm.permissionFlag" @click="deleteMsgById(scope.row, scope.$rowIndex)">删除</el-button>
+                <el-button type="text"  icon="el-icon-delete" size="small" v-if="inputForm.permissionFlag&&showVi" @click="deleteMsgById(scope.row, scope.$rowIndex)">删除</el-button>
               </template>
             </vxe-column>
           </vxe-table>
@@ -439,7 +439,8 @@
         showViewer: false, // 显示查看器
         url: '',
         rowurl: '',
-        src: ''
+        src: '',
+        showVi: true
       }
     },
     components: { ElImageViewer },
@@ -555,6 +556,7 @@
         } else if (method === 'edit') {
           this.title = '修改项目信息'
         } else if (method === 'view') {
+          this.showVi = false
           this.title = '查看项目详情'
         }
         this.visible = true
@@ -607,6 +609,7 @@
       close () {
         this.$refs.inputForm.resetFields()
         this.visible = false
+        this.showVi = true
       },
       httpRequest (file) {
         httpRequest(file, fileName(file), 'projectRecords')