fix

src/components/project/Project.vue

@@ -57,6 +57,9 @@
           </el-input>
           <span v-if="!isModifyMode">{{project.budget}}¥</span>
         </el-form-item>
+        <el-form-item 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 label="需求描述">
           <el-input style="width: 400px" autosize v-if="isModifyMode" type="textarea" v-model="project.desc"></el-input>
           <span v-if="!isModifyMode">{{project.desc}}</span>
@@ -140,8 +143,11 @@
               <em>点击上传</em>
             </div>
           </el-upload>
-          <span v-if="!isModifyMode"><a :href="project.requireDocUrl"><el-link :underline="false" type="primary"><i
-            class="el-icon-document"></i>下载文档</el-link></a></span>
+          <span v-if="!isModifyMode">
+            <a :href="project.requireDocUrl" v-if="project.requireDocUrl!=null && project.requireDocUrl!=''"><el-link :underline="false" type="primary"><i
+            class="el-icon-document"></i>下载文档</el-link></a>
+            <i v-if="project.requireDocUrl==null || project.requireDocUrl==''" class="el-icon-document">暂无文档</i>
+          </span>
         </el-form-item>
         <el-form-item label="安装包" prop="file">
           <el-upload
@@ -163,8 +169,11 @@
               <em>点击上传</em>
             </div>
           </el-upload>
-          <span v-if="!isModifyMode"><a :href="project.fileUrl"><el-link :underline="false" type="primary"><i
-            class="el-icon-document"></i>下载文件</el-link></a></span>
+          <span v-if="!isModifyMode">
+            <a v-if="project.fileUrl!=null && project.fileUrl!=''" :href="project.fileUrl"><el-link :underline="false" type="primary"><i
+            class="el-icon-document"></i>下载文件</el-link></a>
+            <i v-if="project.fileUrl==null || project.fileUrl==''" class="el-icon-document">下载文件</i>
+          </span>
         </el-form-item>
         <el-form-item label="项目截止时间" prop="datetime">
           <div class="block" v-if="isModifyMode">

src/components/task/Task.vue

@@ -87,10 +87,10 @@
             </div>
           </el-upload>
           <span v-if="!isModifyMode">
-              <span v-if="task.requireDocUrl == null">
-                暂无文件
+              <span v-if="task.requireDocUrl == null || task.requireDocUrl == ''">
+                <i class="el-icon-document"></i>暂无文件
               </span>
-              <span v-if="task.requireDocUrl != null">
+              <span v-if="task.requireDocUrl != null && task.requireDocUrl != ''">
                 <a :href="task.requireDocUrl"><el-link :underline="false" type="primary"><i
                   class="el-icon-document"></i>下载文档</el-link></a>
               </span>

src/components/task/TaskCreate.vue

@@ -181,24 +181,24 @@ export default {
     institution (val) {
       this.institution = val
     },
-    'task.institution' () {
-      if (this.task.institution) {
-        this.$refs.addFormProvince.resetProviceCity()
-        this.task.location = {provinceCode: '', cityCode: ''}
-      }
-    },
-    'task.location' () {
-      if (this.task.location.provinceCode || this.task.location.cityCode) {
-        this.task.institution = ''
-      }
-    },
-    'task.resource' () {
-      if (this.task.resource == '广场') {
-        this.$refs.addFormProvince.resetProviceCity()
-        this.task.institution = ''
-        this.task.location = {provinceCode: '', cityCode: ''}
-      }
-    },
+    // 'task.institution' () {
+    //   if (this.task.institution) {
+    //     this.$refs.addFormProvince.resetProviceCity()
+    //     this.task.location = {provinceCode: '', cityCode: ''}
+    //   }
+    // },
+    // 'task.location' () {
+    //   if (this.task.location.provinceCode || this.task.location.cityCode) {
+    //     this.task.institution = ''
+    //   }
+    // },
+    // 'task.resource' () {
+    //   if (this.task.resource == '广场') {
+    //     this.$refs.addFormProvince.resetProviceCity()
+    //     this.task.institution = ''
+    //     this.task.location = {provinceCode: '', cityCode: ''}
+    //   }
+    // },
     deep: true
   },
   mounted () {
@@ -327,6 +327,7 @@ export default {
       return isDOC || isEXCEL || isPDF || isTXT || isXLS || isXLSX
     },
     uploadRequireDoc (param) {
+      this.showLoading()
       const formData = new FormData()
       let config = {
         //添加请求头
@@ -334,9 +335,13 @@ export default {
       }
       formData.append('file', param.file)
       Http.upload(Apis.FILE.REQUIREMENT_FILE.replace('{userId}', this.user.userVO.id), formData, config).then((res) => {
-        console.log('上传成功')
+        this.hideLoading()
+        notify('success','上传成功')
         this.task.requireDocUrl = res.data
         console.log(res.data)
+      }).catch((error)=>{
+        this.hideLoading()
+        notify('error','上传失败:'+error.data)
       })
     },
     setServiceType () {