wangJJ преди 5 години
родител
ревизия
a70feda712
променени са 2 файла, в които са добавени 5 реда и са изтрити 4 реда
  1. 3 3
      src/components/project/Project.vue
  2. 2 1
      src/components/report/TaskReportCreate.vue

+ 3 - 3
src/components/project/Project.vue

@@ -35,7 +35,7 @@
             <el-form-item v-if="!isModifyMode" size="small" label="状态" prop="status">
               <span v-if="!isModifyMode">{{project.status==1?'等待接收':(project.status==2?'已被接收':(project.status==3?'项目已提交':'项目已结束'))}}</span>
             </el-form-item>
-            <el-form-item size="small" label="区域管理员" prop="institution" >
+            <el-form-item size="small" label="区域管理员" prop="institution" v-if="project.institution">
               <span v-if="!isModifyMode">{{project.institution}}</span>
             </el-form-item>
             <el-form-item label="需求描述">
@@ -78,13 +78,13 @@
             <el-form-item label="项目可见性" prop="resource">
               <div v-if="!isModifyMode">
                 <div v-if="project.resource=='1'">{{updateLocation(project.location)}}</div>
-                <div v-if="project.resource=='0'">{{project.institution==null?'暂未被接收':project.institution}}</div>
+                <div v-if="project.resource=='0'">定向</div>
                 <div v-if="project.resource=='2'">{{resourceType[project.resource]}}</div>
               </div>
               <el-tabs :tab-position="tabPosition" v-model="project.resource" style="max-height: 200px;"
                        v-if="isModifyMode">
                 <el-tab-pane :label="resourceType[0]" name="0">
-                  <el-radio-group v-model="project.institution">
+                  <el-radio-group v-model="project.institution" v-if="p">
                     <el-radio :label="item" name="type" v-for="(item,index) in institutionArray" :key="index">
                       {{item.name}}
                     </el-radio>

+ 2 - 1
src/components/report/TaskReportCreate.vue

@@ -191,6 +191,7 @@ export default {
       return isDOC || isEXCEL || isPDF || isTXT || isXLS || isXLSX
       */
     },
+
     loadData () {
     },
     uploadReportFile (param) {
@@ -201,7 +202,7 @@ export default {
       }
       formData.append('file', param.file)
       Http.upload(Apis.FILE.UPLOAD_REPORT_FILE.replace('{userId}', this.user.userVO.id), formData, config).then((res) => {
-        console.log('上传成功')
+        notify('success', '上传成功')
         this.report.fileUrl = res.data
         console.log(res)
       })