调整机构名称和省市的保存方式

src/components/authen/IndividualAuthentication.vue

@@ -14,7 +14,7 @@
             :show-file-list="false"
             :http-request="uploadFile"
             :before-upload="beforeFileUpload">
-            <img  v-if="authentication.photoUrl" :src="authentication.photoUrl" class="avatar">
+            <img v-if="authentication.photoUrl" :src="authentication.photoUrl" class="avatar">
             <i v-else class="el-icon-plus avatar-uploader-icon"></i>
           </el-upload>
           <!--<div v-if="!isModifyMode">-->
@@ -54,7 +54,12 @@
 import Http from '@/js/http'
 import Apis from '@/js/api'
 import {notify} from '@/constants/index'
-import {getAllAgencyResourceTypes, getAllServiceTypes} from '@/js/index'
+import {
+  getAllAgencyResourceTypes,
+  getAllServiceTypes,
+  getProvinceCodeByProvinceName,
+  getProvinceNameByProvinceCode
+} from '@/js/index'
 
 export default {
   name: 'IndividualAuthentication',
@@ -99,6 +104,8 @@ export default {
   methods: {
     //初始化数据
     init () {
+      console.log(getProvinceNameByProvinceCode(1100,1100))
+      console.log(getProvinceCodeByProvinceName('江苏省','盐城市'))
     },
     //加载数据
     loadData: function () {

src/components/project/Project.vue

@@ -71,10 +71,10 @@
           </el-checkbox-group>
           <span v-if="!isModifyMode" class="badge" v-for="item in project.type">{{item}}</span>
         </el-form-item>
-        <el-form-item label="用途" prop="usage">
-          <el-input v-if="isModifyMode" v-model="project.usage"></el-input>
-          <span v-if="!isModifyMode">{{project.usage}}</span>
-        </el-form-item>
+        <!--<el-form-item label="用途" prop="usage">-->
+          <!--<el-input v-if="isModifyMode" v-model="project.usage"></el-input>-->
+          <!--<span v-if="!isModifyMode">{{project.usage}}</span>-->
+        <!--</el-form-item>-->
 
         <el-form-item label="预算" prop="budget">
           <el-input v-if="isModifyMode" type="number" v-model="project.budget">
@@ -294,7 +294,7 @@ import ResourceType from '@/constants/enum/resource-type'
 import provincecity from '@/components/commons/ProvinceCity'
 import provinceCityJSON from '@/constants/provinceCity.json'
 import {notify} from '@/constants/index'
-import {getAllPlatformTypes, getAllServiceTypes} from '@/js/index'
+import {getAllPlatformTypes, getAllServiceTypes,getAllInstitutions} from '@/js/index'
 
 export default {
   name: 'Project',
@@ -316,7 +316,7 @@ export default {
     return {
       projectId: 0,
       tabPosition: 'top',
-      institutionArray: Enum.institution,
+      institutionArray: [],
       isModifyMode: false,
       platforms: [],
       resourceType: ResourceType,
@@ -449,6 +449,7 @@ export default {
       this.projectId = this.$route.params.projectId
       this.setServiceType()
       this.setPlatformType()
+      this.setInstitutions()
       this.loadData()
       // this.project.platform.map(item => {
       //   this.platformType.push(PlatformType[item])
@@ -674,6 +675,9 @@ export default {
     },
     setPlatformType () {
       this.platforms = getAllPlatformTypes()
+    },
+    setInstitutions(){
+      this.institutionArray = getAllInstitutions()
     }
   }
 }

src/components/project/ProjectCreate.vue

@@ -48,9 +48,9 @@
             </span>
           </el-checkbox-group>
         </el-form-item>
-        <el-form-item label="用途" prop="usage">
-          <el-input v-model="project.usage"></el-input>
-        </el-form-item>
+        <!--<el-form-item label="用途" prop="usage">-->
+          <!--<el-input v-model="project.usage"></el-input>-->
+        <!--</el-form-item>-->
         <el-form-item label="预算" prop="budget">
           <el-input type="number" v-model="project.budget">
             <template slot="append">¥</template>
@@ -152,7 +152,7 @@ import provincecity from '@/components/commons/ProvinceCity'
 import provinceCityJSON from '@/constants/provinceCity.json'
 import ResourceType from '@/constants/enum/resource-type'
 import {notify} from '@/constants/index'
-import {getAllPlatformTypes, getAllServiceTypes} from '@/js/index'
+import {getAllInstitutions, getAllPlatformTypes, getAllServiceTypes} from '@/js/index'
 
 export default {
   name: 'ProjectCreate',
@@ -172,7 +172,7 @@ export default {
     }
     return {
       tabPosition: 'top',
-      institutionArray: Enum.institution,
+      institutionArray: [],
       platforms: [],
       serviceType: [],
       resourceType: ResourceType,
@@ -306,6 +306,7 @@ export default {
     init () {
       this.setServiceType()
       this.setPlatforms()
+      this.setInstitution()
       // this.project.platform.map(item => {
       //   this.platformType.push(PlatformType[item])
       // })
@@ -447,6 +448,9 @@ export default {
     },
     setPlatforms () {
       this.platforms = getAllPlatformTypes()
+    },
+    setInstitution () {
+      this.institutionArray = getAllInstitutions()
     }
   }
 }

src/components/report/ReportList.vue

@@ -17,8 +17,8 @@
       </el-table-column>
       <el-table-column prop="file" sortable label="报告文件">
         <template slot-scope="scope">
-          <span v-if="scope.row.content==null">暂无文件</span>
-          <a :href="scope.row.content" v-if="scope.row.content!=0" target="_blank"><i
+          <span v-if="scope.row.content==null || scope.row.content==''">暂无文件</span>
+          <a :href="scope.row.content" v-if="scope.row.content!=null" target="_blank"><i
             class="fa fa-file-text-o"></i> {{scope.row.content}}</a>
         </template>
       </el-table-column>

src/components/task/Task.vue

@@ -125,7 +125,6 @@
 </template>
 
 <script>
-import Enum from '@/constants/enum/index'
 import ResourceType from '@/constants/enum/resource-type.js'
 import provincecity from '@/components/commons/ProvinceCity'
 import provinceCityJSON from '@/constants/provinceCity.json'
@@ -133,7 +132,7 @@ import ReportList from '@/components/report/ReportList'
 import Http from '@/js/http.js'
 import Apis from '@/js/api.js'
 import {notify} from '@/constants/index'
-import {getAllServiceTypes} from '@/js/index'
+import {getAllInstitutions, getAllServiceTypes} from '@/js/index'
 
 export default {
   name: 'Task',
@@ -144,7 +143,7 @@ export default {
   data () {
     return {
       isModifyMode: false,
-      institutionArray: Enum.institution,
+      institutionArray: [],
       tabPosition: 'top',
       resourceType: ResourceType,
       serviceType: [],
@@ -215,7 +214,7 @@ export default {
   watch: {
     'task.institution' () {
       if (this.task.institution) {
-        this.$refs.addFormProvince.resetProviceCity()
+        //this.$refs.addFormProvince.resetProviceCity()
         this.task.location = {provinceCode: '', cityCode: ''}
       }
     },
@@ -243,6 +242,7 @@ export default {
       this.taskId = this.$route.params.taskId
       this.projectId = this.$route.params.projectId
       this.loadData(this.projectId, this.taskId)
+      this.setInstitutions()
     },
     updateLocation (location) {
       var provinceName = ''
@@ -424,6 +424,9 @@ export default {
     },
     setServiceType () {
       this.serviceType = getAllServiceTypes()
+    },
+    setInstitutions () {
+      this.institutionArray = getAllInstitutions();
     }
   },
   // created () {

src/components/task/TaskCreate.vue

@@ -7,7 +7,7 @@
           <el-input v-model="task.name"></el-input>
         </el-form-item>
         <el-form-item label="任务描述" prop="desc">
-          <el-input type="textarea" v-model="task.desc"></el-input>
+          <el-input type="textarea" style="width: 400px" v-model="task.desc"></el-input>
         </el-form-item>
         <el-form-item label="任务报价" prop="quotePrice">
           <el-input v-model="task.quotePrice"></el-input>
@@ -23,7 +23,7 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item label="任务可见性" prop="resource">
-          <el-tabs :tab-position="tabPosition" v-model="task.resource" style="max-height: 200px;">
+          <el-tabs :tab-position="tabPosition" v-model="task.resource" style="width: 800px">
             <el-tab-pane :label="resourceType[0]" name="0">
               <el-radio-group v-model="task.institution">
                 <el-radio
@@ -47,7 +47,6 @@
         </el-form-item>
         <el-form-item label="需求文档" prop="doc">
           <el-upload
-            v-if="isModifyMode"
             drag
             class="upload-demo"
             action=""
@@ -66,14 +65,6 @@
             </div>
             <div class="el-upload__tip" slot="tip">请上传需求文档</div>
           </el-upload>
-          <span v-if="!isModifyMode">
-              <span v-if="task.requireDocUrl == null">
-                暂无文件
-              </span>
-              <span v-if="task.requireDocUrl != null">
-                <a :href="task.requireDocUrl">{{task.requireDocUrl}}</a>
-              </span>
-            </span>
         </el-form-item>
         <el-form-item label="任务截止时间" prop="datetime">
           <div class="block">
@@ -104,7 +95,7 @@ import Http from '@/js/http.js'
 import Apis from '@/js/api.js'
 import ResourceType from '@/constants/enum/resource-type.js'
 import {notify} from '@/constants/index'
-import {getAllServiceTypes} from '@/js/index'
+import {getAllServiceTypes,getAllInstitutions} from '@/js/index'
 
 export default {
   name: 'Task',
@@ -114,7 +105,7 @@ export default {
   data () {
     return {
       projectId: 0,
-      institutionArray: Enum.institution,
+      institutionArray: [],
       tabPosition: 'top',
       resourceType: ResourceType,
       serviceType: [],
@@ -209,6 +200,7 @@ export default {
     init () {
       this.projectId = this.$route.params.projectId
       this.setServiceType()
+      this.setInstitutions()
     },
     updateLocation (location) {
       var provinceName = ''
@@ -345,6 +337,9 @@ export default {
     },
     setServiceType () {
       this.serviceType = getAllServiceTypes()
+    },
+    setInstitutions () {
+      this.institutionArray = getAllInstitutions()
     }
   }
 }
@@ -354,7 +349,9 @@ export default {
   .el-radio {
     margin: 10px 20px 10px 0;
   }
-
+  .el-input{
+    width: 400px;
+  }
   .el-form-item /deep/ .el-tabs__content {
     max-height: 120px !important;
     overflow: auto;

src/js/index.js

@@ -1,5 +1,6 @@
 import Http from './http'
 import Apis from './api'
+import ProvinceJson from '../constants/provinceCity'
 
 //存session
 export const storageSave = (key, value) => {
@@ -211,3 +212,40 @@ export const uploadAgencyAuthenticationInfo = () => {
 
 }
 
+//获取所有定向发布的目标
+export const getAllInstitutions = () => {
+  return ['慕测', '华为']
+}
+
+//通过代码获取省、市名称
+export const getProvinceNameByProvinceCode = (provinceCode, cityCode) => {
+  for (var i = 0; i < ProvinceJson.provinces.length; i++) {
+    if (ProvinceJson.provinces[i].code == provinceCode) {
+      for (var j = 0; j < ProvinceJson.provinces[i].cities.length; j++) {
+        if (ProvinceJson.provinces[i].cities[j].code == cityCode) {
+          return {
+            'province': ProvinceJson.provinces[i].name,
+            'city': ProvinceJson.provinces[i].cities[j].name
+          }
+        }
+      }
+    }
+  }
+  return null
+}
+//通过名称获取省、市代码
+export const getProvinceCodeByProvinceName = (provinceName, cityName) => {
+  for (var i = 0; i < ProvinceJson.provinces.length; i++) {
+    if (ProvinceJson.provinces[i].name == provinceName) {
+      for (var j = 0; j < ProvinceJson.provinces[i].cities.length; j++) {
+        if (ProvinceJson.provinces[i].cities[j].name == cityName) {
+          return {
+            'province': ProvinceJson.provinces[i].code,
+            'city': ProvinceJson.provinces[i].cities[j].code
+          }
+        }
+      }
+    }
+  }
+  return null
+}