修改institution

src/components/project/Project.vue

@@ -86,23 +86,16 @@
         <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}}</div>
+            <div v-if="project.resource=='0'">{{project.institution.name}}</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-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
-                  :label="item"
-                  name="type"
-                  v-for="(item,index) in institutionArray"
-                  :key="index"
-                ></el-radio>
+                <el-radio :label="item" name="type" v-for="(item,index) in institutionArray" :key="index">
+                  {{item.name}}
+                </el-radio>
               </el-radio-group>
             </el-tab-pane>
             <el-tab-pane :label="resourceType[1]" name="1">
@@ -250,7 +243,7 @@
           <el-table-column prop="resource" label="任务可见性">
             <template slot-scope="scope">
               <div v-if="scope.row.resource=='1'">{{updateLocation(scope.row.location)}}</div>
-              <div v-if="scope.row.resource=='0'">{{scope.row.institution}}</div>
+              <div v-if="scope.row.resource=='0'">{{scope.row.institution.name}}</div>
               <div v-if="scope.row.resource=='2'">{{resourceType[scope.row.resource]}}</div>
             </template>
           </el-table-column>
@@ -336,7 +329,7 @@ export default {
         desc: '',
         resource: '',
         location: '',
-        institution: '',
+        institution: {},
         contactName: '',
         contactPhone: '',
         doc: [],
@@ -473,7 +466,7 @@ export default {
         desc: this.project.desc,
         resource: this.project.resource,
         location: getProvinceNameByProvinceCode(this.project.location.provinceCode, this.project.location.cityCode),
-        institution: this.project.institution,
+        institution: this.project.institution.id,
         contactName: this.project.contactName,
         contactPhone: this.project.contactPhone,
         doc: this.project.requireDocUrl,

src/components/project/ProjectCreate.vue

@@ -64,12 +64,7 @@
           >
             <el-tab-pane :label="resourceType[0]" name="0">
               <el-radio-group v-model="project.institution">
-                <el-radio
-                  :label="item"
-                  name="type"
-                  v-for="item,index in institutionArray"
-                  :key="index"
-                ></el-radio>
+                <el-radio :label="item" name="type" v-for="item,index in institutionArray" :key="index">{{item.name}}</el-radio>
               </el-radio-group>
             </el-tab-pane>
             <el-tab-pane :label="resourceType[1]" name="1">
@@ -196,7 +191,7 @@ export default {
         fileUrl: '',
         resource: '0',
         location: {provinceCode: '3200', cityCode: '3201'},
-        institution: '',
+        institution: {},
         datetime: '',
         price: '',
         usage: '',
@@ -329,7 +324,7 @@ export default {
         desc: this.project.desc,
         resource: this.project.resource,
         location: newLocation,
-        institution: this.project.institution,
+        institution: this.project.institution.id,
         contactName: this.project.contactName,
         contactPhone: this.project.contactPhone,
         doc: this.project.requireDocUrl,
@@ -349,7 +344,7 @@ export default {
         }
       }).catch(error => {
         //console.log(error)
-        notify('error', error.data.msg)
+        notify('error', error.data)
 
       })
       // this.$refs[formName].validate(valid => {

src/components/task/Task.vue

@@ -31,7 +31,7 @@
         <el-form-item label="任务可见性" prop="resource">
           <div v-if="!isModifyMode">
             <div v-if="task.resource=='1'">{{updateLocation(task.location)}}</div>
-            <div v-if="task.resource=='0'">{{task.institution}}</div>
+            <div v-if="task.resource=='0'">{{task.institution.name}}</div>
             <div v-if="task.resource=='2'">{{resourceType[task.resource]}}</div>
           </div>
           <el-tabs
@@ -47,7 +47,8 @@
                   name="type"
                   v-for="item,index in institutionArray"
                   :key="index"
-                ></el-radio>
+                >{{item.name}}
+                </el-radio>
               </el-radio-group>
             </el-tab-pane>
             <el-tab-pane :label="resourceType[1]" name="1">
@@ -162,7 +163,7 @@ export default {
         type: '',
         resource: '',
         location: {},
-        institution: '',
+        institution: {},
         datetime: '',
         quotePrice: '',
         fixedPrice: '',
@@ -275,7 +276,7 @@ export default {
         type: this.task.serviceType,
         resource: this.task.resource,
         location: getProvinceNameByProvinceCode(this.task.location.provinceCode, this.task.location.cityCode),
-        institution: this.task.institution,
+        institution: this.task.institution.id,
         datetime: this.task.datetime,
         quotePrice: this.task.quotePrice,
         fixedPrice: this.task.fixedPrice,

src/components/task/TaskCreate.vue

@@ -31,7 +31,7 @@
                   name="type"
                   v-for="item,index in institutionArray"
                   :key="index"
-                ></el-radio>
+                >{{item.name}}</el-radio>
               </el-radio-group>
             </el-tab-pane>
             <el-tab-pane :label="resourceType[1]" name="1">

src/js/index.js

@@ -1,7 +1,6 @@
 import Http from './http'
 import Apis from './api'
 import ProvinceJson from '../constants/provinceCity'
-import http from './http';
 
 //存session
 export const storageSave = (key, value) => {
@@ -232,7 +231,20 @@ export const uploadAgencyAuthenticationInfo = () => {
 
 //获取所有定向发布的目标
 export const getAllInstitutions = () => {
-  return ['慕测', '华为']
+  return [
+    {
+      id: 1,
+      name: '慕测1'
+    },
+    {
+      id: 2,
+      name: '慕测2'
+    },
+    {
+      id: 3,
+      name: '慕测3'
+    },
+  ]
 }
 
 //通过代码获取省、市名称