修改了location的表示方式

src/components/project/Project.vue

@@ -72,8 +72,8 @@
           <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-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">
@@ -286,7 +286,6 @@
 </template>
 
 <script>
-import Enum from '@/constants/enum/index'
 import ReportList from '@/components/report/ReportList'
 import Http from '@/js/http.js'
 import Apis from '@/js/api.js'
@@ -294,7 +293,13 @@ 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,getAllInstitutions} from '@/js/index'
+import {
+  getAllInstitutions,
+  getAllPlatformTypes,
+  getAllServiceTypes,
+  getProvinceCodeByProvinceName,
+  getProvinceNameByProvinceCode
+} from '@/js/index'
 
 export default {
   name: 'Project',
@@ -457,7 +462,6 @@ export default {
     },
     //提交修改
     submitForm (formName) {
-      //PROJ--2019073114009
       const newProject = {
         userId: 3,
         name: this.project.name,
@@ -465,7 +469,7 @@ export default {
         platform: this.project.platform,
         desc: this.project.desc,
         resource: this.project.resource,
-        location: this.project.location,
+        location: getProvinceNameByProvinceCode(this.project.location.provinceCode, this.project.location.cityCode),
         institution: this.project.institution,
         contactName: this.project.contactName,
         contactPhone: this.project.contactPhone,
@@ -613,7 +617,7 @@ export default {
         this.project.doc = []
         this.project.file = []
         this.project.resource = res.projectDetails.resource
-        this.project.location = res.projectDetails.location
+        this.project.location = getProvinceCodeByProvinceName(res.projectDetails.location.provinceCode, res.projectDetails.location.cityCode)
         this.project.institution = res.projectDetails.institution
         this.project.datetime = new Date(res.projectDetails.datetime)
         this.project.price = res.projectDetails.price
@@ -676,7 +680,7 @@ export default {
     setPlatformType () {
       this.platforms = getAllPlatformTypes()
     },
-    setInstitutions(){
+    setInstitutions () {
       this.institutionArray = getAllInstitutions()
     }
   }

src/components/project/ProjectCreate.vue

@@ -49,7 +49,7 @@
           </el-checkbox-group>
         </el-form-item>
         <!--<el-form-item label="用途" prop="usage">-->
-          <!--<el-input v-model="project.usage"></el-input>-->
+        <!--<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">
@@ -145,14 +145,13 @@
 </template>
 
 <script>
-import Enum from '@/constants/enum/index'
 import Http from '@/js/http.js'
 import Apis from '@/js/api.js'
 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 {getAllInstitutions, getAllPlatformTypes, getAllServiceTypes} from '@/js/index'
+import {getAllInstitutions, getAllPlatformTypes, getAllServiceTypes, getProvinceNameByProvinceCode} from '@/js/index'
 
 export default {
   name: 'ProjectCreate',
@@ -313,6 +312,7 @@ export default {
     },
     submitForm (formName) {
       //console.log(this.project)
+      const newLocation = getProvinceNameByProvinceCode(this.project.location.provinceCode, this.project.location.cityCode)
       const newProject = {
         userId: 3,
         name: this.project.name,
@@ -320,7 +320,7 @@ export default {
         platform: this.project.platform,
         desc: this.project.desc,
         resource: this.project.resource,
-        location: this.project.location,
+        location: newLocation,
         institution: this.project.institution,
         contactName: this.project.contactName,
         contactPhone: this.project.contactPhone,

src/components/task/Task.vue

@@ -132,7 +132,12 @@ import ReportList from '@/components/report/ReportList'
 import Http from '@/js/http.js'
 import Apis from '@/js/api.js'
 import {notify} from '@/constants/index'
-import {getAllInstitutions, getAllServiceTypes} from '@/js/index'
+import {
+  getAllInstitutions,
+  getAllServiceTypes,
+  getProvinceCodeByProvinceName,
+  getProvinceNameByProvinceCode
+} from '@/js/index'
 
 export default {
   name: 'Task',
@@ -261,32 +266,32 @@ export default {
       return provinceName + ' / ' + cityName
     },
     submitForm (formName) {
-      console.log(this.task)
-      this.$refs[formName].validate(valid => {
-        if (valid) {
-          this.isModifyMode = false
-          const newTask = {
-            name: this.task.title,
-            desc: this.task.description,
-            type: this.task.serviceType,
-            resource: this.task.resource,
-            location: this.task.location,
-            institution: this.task.institution,
-            datetime: this.task.datetime,
-            quotePrice: this.task.quotePrice,
-            fixedPrice: this.task.fixedPrice,
-            requireDoc: this.task.requireDocUrl
-          }
-          //修改TASK
-          Http.put(Apis.TASK.UPDATE_TASK.replace('{projectId}', this.projectId).replace('{taskId}', this.taskId), newTask).then((res) => {
-            console.log(res)
-          })
-          //提交 task
-        } else {
-          console.log('error submit!!')
-          return false
-        }
+      const newTask = {
+        name: this.task.title,
+        desc: this.task.description,
+        type: this.task.serviceType,
+        resource: this.task.resource,
+        location: getProvinceNameByProvinceCode(this.task.location.provinceCode, this.task.location.cityCode),
+        institution: this.task.institution,
+        datetime: this.task.datetime,
+        quotePrice: this.task.quotePrice,
+        fixedPrice: this.task.fixedPrice,
+        requireDoc: this.task.requireDocUrl
+      }
+      //修改TASK
+      Http.put(Apis.TASK.UPDATE_TASK.replace('{projectId}', this.projectId).replace('{taskId}', this.taskId), newTask).then((res) => {
+        this.isModifyMode = false
+        console.log(res)
       })
+      // this.$refs[formName].validate(valid => {
+      //   if (valid) {
+      //     this.isModifyMode = false
+      //
+      //   } else {
+      //     console.log('error submit!!')
+      //     return false
+      //   }
+      // })
     },
     cancelMode (formName) {
       this.isModifyMode = false
@@ -358,7 +363,7 @@ export default {
         this.task.description = res.crowdTaskVO.description
         this.task.serviceType = res.crowdTaskVO.serviceType
         this.task.resource = res.crowdTaskVO.resource
-        this.task.location = res.crowdTaskVO.location
+        this.task.location = getProvinceCodeByProvinceName(res.crowdTaskVO.location.provinceCode, res.crowdTaskVO.location.cityCode)
         this.task.institution = res.crowdTaskVO.institution
         this.task.datetime = new Date(res.crowdTaskVO.datetime)
         this.task.quotePrice = res.crowdTaskVO.quotePrice
@@ -426,7 +431,7 @@ export default {
       this.serviceType = getAllServiceTypes()
     },
     setInstitutions () {
-      this.institutionArray = getAllInstitutions();
+      this.institutionArray = getAllInstitutions()
     }
   },
   // created () {

src/components/task/TaskCreate.vue

@@ -88,14 +88,13 @@
 </template>
 
 <script>
-import Enum from '@/constants/enum/index'
 import provincecity from '@/components/commons/ProvinceCity'
 import provinceCityJSON from '@/constants/provinceCity.json'
 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,getAllInstitutions} from '@/js/index'
+import {getAllInstitutions, getAllServiceTypes, getProvinceNameByProvinceCode} from '@/js/index'
 
 export default {
   name: 'Task',
@@ -224,7 +223,7 @@ export default {
         desc: this.task.desc,
         type: this.task.type,
         resource: this.task.resource,
-        location: this.task.location,
+        location: getProvinceNameByProvinceCode(this.task.location.provinceCode, this.task.location.cityCode),
         institution: this.task.institution,
         datetime: this.task.datetime,
         quotePrice: this.task.quotePrice,
@@ -309,19 +308,6 @@ export default {
       }
       return isDOC || isEXCEL || isPDF || isTXT || isXLS || isXLSX
     },
-    uploadProjectCreateExcelFile (param) {
-      const formData = new FormData()
-      let config = {
-        //添加请求头
-        headers: {'Content-Type': 'multipart/form-data'},
-      }
-      formData.append('file', param.file)
-      Http.upload(Apis.PROJECT.ADD_PROJECT_BY_EXCEL, formData, config).then((res) => {
-        console.log('上传成功')
-        this.project.excelFileUrl = res.data
-        console.log(res.data)
-      })
-    },
     uploadRequireDoc (param) {
       const formData = new FormData()
       let config = {
@@ -349,9 +335,11 @@ export default {
   .el-radio {
     margin: 10px 20px 10px 0;
   }
-  .el-input{
+
+  .el-input {
     width: 400px;
   }
+
   .el-form-item /deep/ .el-tabs__content {
     max-height: 120px !important;
     overflow: auto;

src/js/index.js

@@ -224,8 +224,8 @@ export const getProvinceNameByProvinceCode = (provinceCode, cityCode) => {
       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
+            'provinceCode': ProvinceJson.provinces[i].name,
+            'cityCode': ProvinceJson.provinces[i].cities[j].name
           }
         }
       }
@@ -240,8 +240,8 @@ export const getProvinceCodeByProvinceName = (provinceName, cityName) => {
       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
+            'provinceCode': ProvinceJson.provinces[i].code,
+            'cityCode': ProvinceJson.provinces[i].cities[j].code
           }
         }
       }