update

src/components/project/Project.vue

@@ -32,12 +32,19 @@
               </el-input>
               <span v-if="!isModifyMode">{{project.budget}}¥</span>
             </el-form-item>
-            <el-form-item size="small" label="计价标准" prop="valuationStandard">
-              <el-input v-if="isModifyMode" type="number" v-model="project.valuationStandard">
-                <template slot="append"></template>
-              </el-input>
+
+            <el-form-item label="计价标准" prop="valuationStandard">
+              <el-input style="width: 400px" autosize v-if="isModifyMode" type="textarea"
+                        v-model="project.valuationStandard"></el-input>
               <span v-if="!isModifyMode">{{project.valuationStandard}}</span>
             </el-form-item>
+
+<!--            <el-form-item size="small" label="计价标准" prop="valuationStandard">-->
+<!--              <el-input v-if="isModifyMode" type="number" v-model="project.valuationStandard">-->
+<!--                <template slot="append"></template>-->
+<!--              </el-input>-->
+<!--              <span v-if="!isModifyMode">{{project.valuationStandard}}</span>-->
+<!--            </el-form-item>-->
             <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>
@@ -58,34 +65,32 @@
             <el-form-item label="领域类型" prop="field">
               <el-radio-group v-if="isModifyMode" v-model="project.field">
                 <span v-for="(item,index) in fields" :key="index">
-              <el-radio :label="item" style="margin: 3px">{{ item }}&nbsp;&nbsp;&nbsp;&nbsp;</el-radio>
+              <el-radio :label="item.code" style="margin: 3px">{{ item.name }}&nbsp;&nbsp;&nbsp;&nbsp;</el-radio>
             </span>
               </el-radio-group>
               <span
                 v-if="!isModifyMode"
                 class="badge"
               >
-<!--                v-for="item in project.platform"-->
               {{project.field}}</span>
             </el-form-item>
 
             <el-form-item label="应用类型" prop="platform">
               <el-radio-group v-if="isModifyMode" v-model="project.platform">
                 <span v-for="(item,index) in platforms" :key="index">
-              <el-radio :label="item" style="margin: 3px">{{ item }}&nbsp;&nbsp;&nbsp;&nbsp;</el-radio>
+              <el-radio :label="item.code" style="margin: 3px">{{ item.name }}&nbsp;&nbsp;&nbsp;&nbsp;</el-radio>
             </span>
               </el-radio-group>
               <span
                 v-if="!isModifyMode"
                 class="badge"
               >
-<!--                v-for="item in project.platform"-->
               {{project.platform}}</span>
             </el-form-item>
             <el-form-item label="服务类型" prop="type">
               <el-checkbox-group v-if="isModifyMode" v-model="project.type">
             <span v-for="(item,index) in serviceType" :key="index">
-              <el-checkbox :label="item" name="type">{{ item }}&nbsp;&nbsp;</el-checkbox>
+              <el-checkbox :label="item.code" name="type">{{ item.name }}&nbsp;&nbsp;</el-checkbox>
             </span>
               </el-checkbox-group>
               <span v-if="!isModifyMode" class="badge" v-for="item in project.type">{{item}}</span>
@@ -180,16 +185,9 @@
           </span>
             </el-form-item>
             <el-form-item label="委托单位" prop="entrustUnit" v-if="project.entrustUnit">
-              <el-radio-group v-if="isModifyMode" v-model="project.entrustUnit">
-              <span v-for="(item,index) in fields" :key="index">
-            <el-radio :label="item" style="margin: 3px">{{ item }}&nbsp;&nbsp;&nbsp;&nbsp;</el-radio>
-          </span>
-              </el-radio-group>
-              <span
-                v-if="!isModifyMode"
-                class="badge"
-              >
-            {{project.entrustUnit}}</span>
+              <el-input style="width: 400px" autosize v-if="isModifyMode" type="textarea"
+                        v-model="project.entrustUnit"></el-input>
+              <span v-if="!isModifyMode">{{project.entrustUnit}}</span>
             </el-form-item>
             <el-form-item label="项目截止时间" prop="datetime">
               <div class="block" v-if="isModifyMode">
@@ -264,7 +262,7 @@
               <div v-if="scope.row.resource=='2'">{{resourceType[scope.row.resource]}}</div>
             </template>
           </el-table-column>
-          <el-table-column prop="type" label="业务类型">
+          <el-table-column prop="type" label="测试类型">
             <template slot-scope="scope">
               <div class="badge">{{scope.row.serviceType}}</div>
             </template>
@@ -368,7 +366,7 @@ export default {
       project: {
         userId: 0,
         name: '',
-        type: '',
+        type: [],
         platform: '',
         valuationStandard: '',
         entrustUnit:'',
@@ -549,6 +547,7 @@ export default {
     init () {
       this.projectId = this.$route.params.projectId
       this.setServiceType()
+      this.setFields()
       this.setPlatformType()
       this.setInstitutions()
       this.setUserInfo()
@@ -694,7 +693,11 @@ export default {
     //进入修改项目页面
     modifyForm () {
       this.isModifyMode = true
-      console.log(this.project.doc)
+      this.project.type = []
+      this.project.platform = []
+      this.project.field = []
+      console.log(this.project)
+      // console.log(this.project.doc)
       //this.setInstitutions()
       //获得update 信息
       //this.loadData()
@@ -975,17 +978,19 @@ export default {
       })
     },
     setServiceType () {
-      getAllServiceTypes().then((res) => {
-        this.serviceType = res
-      }).catch((error) => {
-        notify('error', '获取项目类型列表失败')
-      })
+        getAllServiceTypes().then((res) => {
+            this.serviceType = res
+        })
     },
     setPlatformType () {
-      this.platforms = getAllPlatformTypes()
+        getAllPlatformTypes().then((res) => {
+            this.platforms = res
+        })
     },
     setFields(){
-        this.fields = getAllFields()
+        getAllFields().then((res) => {
+            this.fields = res
+        })
     }  ,
     setInstitutions () {
       getAllInstitutions().then((res) => {

src/components/project/ProjectCreate.vue

@@ -17,6 +17,10 @@
             <template slot="append">¥</template>
           </el-input>
         </el-form-item>
+        <el-form-item label="计价标准" prop="valuationStandard">
+          <el-input type="textarea" style="width: 400px" v-model="project.valuationStandard"
+                    placeholder="请输入项目的计价标准（eg:1200/人天）"></el-input>
+        </el-form-item>
         <el-form-item label="需求描述" prop="desc">
           <el-input type="textarea" style="width: 400px" v-model="project.desc"
                     placeholder="请输入对项目的描述"></el-input>
@@ -185,6 +189,7 @@ export default {
         contactPhone: '',
         type: [],
         platform: '',
+        valuationStandard:'',
         field: '',
         desc: '',
         doc: [],
@@ -378,6 +383,7 @@ export default {
             platform: this.project.platform,
             field: this.project.field,
             desc: this.project.desc,
+            valuationStandard: this.project.valuationStandard,
             resource: this.project.resource,
             location: newLocation,
             institution: this.project.institution.id,
@@ -422,6 +428,7 @@ export default {
       this.project.platform = ''
       this.project.field = ''
       this.project.desc = ''
+      this.project.valuationStandard = ''
       this.project.file = ''
       this.project.doc = ''
       this.project.contactName = ''
@@ -510,11 +517,6 @@ export default {
       })
     },
     setServiceType () {
-      // getAllServiceTypes().then((res) => {
-      //   this.serviceType = res
-      // }).catch((error) => {
-      //   notify('error', '获取项目服务类型列表失败')
-      // })
         getAllServiceTypes().then((res) => {
             this.serviceType = res
         })
@@ -528,7 +530,6 @@ export default {
         getAllPlatformTypes().then((res) => {
             this.platforms = res
         })
-      // this.platforms = getAllPlatformTypes()
     },
     setInstitution () {
       getAllInstitutions().then((res) => {

src/components/task/Task.vue

@@ -25,10 +25,10 @@
         <!--</el-input>-->
         <!--<span v-if="!isModifyMode">{{task.fixedPrice}}</span>-->
         <!--</el-form-item>-->
-        <el-form-item label="业务类型" prop="serviceType">
+        <el-form-item label="测试类型" prop="serviceType">
           <el-radio-group v-if="isModifyMode" v-model="task.serviceType">
             <span v-for="(item,index) in serviceType" :key="index">
-              <el-radio :label="item" name="type">{{item}}</el-radio>
+              <el-radio :label="item.code" name="type">{{item.name}}</el-radio>
             </span>
           </el-radio-group>
           <span class="badge" v-if="!isModifyMode">{{task.serviceType}}</span>
@@ -52,7 +52,7 @@
                   name="type"
                   v-for="item,index in institutionArray"
                   :key="index"
-                >{{item.name}}
+                >{{item.evaluationAgencyName}}
                 </el-radio>
               </el-radio-group>
             </el-tab-pane>
@@ -315,7 +315,7 @@
             {min: 5, max: 50, message: '任务名称长度在 5 到 50 个字符', trigger: 'blur'}
           ],
           type: [
-            {required: true, message: '业务类型不可为空'},
+            {required: true, message: '测试类型不可为空'},
           ],
           desc: [{required: false, message: '请填写描述', trigger: 'blur'}],
           //price: [{required: true, message: '请填写价格', trigger: 'blur'}],
@@ -398,8 +398,10 @@
           params: {projectId: this.projectId}
         })
       },
+
       //切换至可编辑页面
       modifyForm() {
+        this.task.serviceType = ''
         this.isModifyMode = true
       },
       //切换至不可编辑页面

src/components/task/TaskCreate.vue

@@ -19,10 +19,10 @@
         <!--<template slot="append">¥</template>-->
         <!--</el-input>-->
         <!--</el-form-item>-->
-        <el-form-item label="业务类型" prop="type">
+        <el-form-item label="测试类型" prop="type">
           <el-radio-group v-model="task.type">
             <span v-for="(item,index) in serviceType" :key="index">
-              <el-radio :label="item" name="type">{{item}}</el-radio>
+              <el-radio :label="item.code" name="type">{{item.name}}</el-radio>
             </span>
           </el-radio-group>
         </el-form-item>
@@ -35,7 +35,7 @@
                   name="type"
                   v-for="item,index in institutionArray"
                   :key="index"
-                >{{item.name}}
+                >{{item.evaluationAgencyName}}
                 </el-radio>
               </el-radio-group>
             </el-tab-pane>
@@ -164,7 +164,7 @@ export default {
           {min: 5, max: 50, message: '任务名称长度在 5 到 50 个字符', trigger: 'blur'}
         ],
         type: [
-          {required: true, message: '业务类型不可为空'},
+          {required: true, message: '测试类型不可为空'},
         ],
         desc: [{required: false, message: '请填写描述', trigger: 'blur'}],
         //price: [{required: true, message: '请填写价格', trigger: 'blur'}],
@@ -354,15 +354,14 @@ export default {
       })
     },
     setServiceType () {
-      this.serviceType = getAllServiceTypes().then((res) => {
-        this.serviceType = res
-      }).catch((error) => {
-        notify('error', '加载服务类型列表失败')
-      })
+        getAllServiceTypes().then((res) => {
+            this.serviceType = res
+        })
     },
     setInstitutions () {
       getAllAgencies().then((res) => {
         this.institutionArray = res
+        console.log(this.institutionArray)
       }).catch((error) => {
         notify('error', '测评机构加载失败')
       })

src/components/task/TaskList.vue

@@ -26,7 +26,7 @@ export default {
           platform: [0, 1],
           description: "任务描述文字xxxx",
           price: "30",
-          业务类型: 1,
+          测试类型: 1,
           status: 0
         },
         {
@@ -35,7 +35,7 @@ export default {
           platform: [0],
           description: "任务描述文字xxxx",
           price: "10",
-          业务类型: 0,
+          测试类型: 0,
           status: 1
         },
         {
@@ -44,7 +44,7 @@ export default {
           platform: [1],
           description: "任务描述文字xxxx",
           price: "10",
-          业务类型: 2,
+          测试类型: 2,
           status: 0
         },
         {
@@ -53,7 +53,7 @@ export default {
           platform: [0, 1, 2],
           description: "任务描述文字xxxx",
           price: "0",
-          业务类型: 1,
+          测试类型: 1,
           status: 1
         },
         {
@@ -62,7 +62,7 @@ export default {
           platform: [0, 1],
           description: "任务描述文字xxxx",
           price: "30",
-          业务类型: 1,
+          测试类型: 1,
           status: 0
         }
       ],
@@ -73,7 +73,7 @@ export default {
           platform: [1],
           description: "任务描述文字xxxx",
           price: "10",
-          业务类型: 2,
+          测试类型: 2,
           status: 0
         },
         {
@@ -82,7 +82,7 @@ export default {
           platform: [0, 1, 2],
           description: "任务描述文字xxxx",
           price: "0",
-          业务类型: 1,
+          测试类型: 1,
           status: 1
         },
         {
@@ -91,7 +91,7 @@ export default {
           platform: [0, 1],
           description: "任务描述文字xxxx",
           price: "30",
-          业务类型: 1,
+          测试类型: 1,
           status: 0
         },
         {
@@ -100,7 +100,7 @@ export default {
           platform: [0],
           description: "任务描述文字xxxx",
           price: "10",
-          业务类型: 0,
+          测试类型: 0,
           status: 1
         },
         {
@@ -109,7 +109,7 @@ export default {
           platform: [1],
           description: "任务描述文字xxxx",
           price: "10",
-          业务类型: 2,
+          测试类型: 2,
           status: 0
         },
         {
@@ -118,7 +118,7 @@ export default {
           platform: [0, 1, 2],
           description: "任务描述文字xxxx",
           price: "0",
-          业务类型: 1,
+          测试类型: 1,
           status: 2
         }
       ]

src/js/generalService.js

@@ -68,17 +68,6 @@ export const getAllInstitutions = () => {
 
 //获取所有测评机构
 export const getAllAgencies = () => {
-  // const data = [{
-  //   id: 1,
-  //   name: '慕测'
-  // }, {
-  //   id: 2,
-  //   name: '南大'
-  // }]
-  //
-  // return new Promise((resolve) => {
-  //   resolve(data)
-  // })
   return Http.get(Apis.GENERAL.GET_ALL_AGENCIES)
 }
 
@@ -124,7 +113,7 @@ export const getProvinceCodeByProvinceName = (provinceName, cityName) => {
 //获取批量上传项目模板文件
 export const getGreenChannelAddProjectExcelTemplateFile = (getTemplateExcelSuccess, getTemplateExcelFail) => {
   const data = {
-    fileUrl: 'http://mooctest-crowd-service.oss-cn-hangzhou.aliyuncs.com/Others/%E9%A1%B9%E7%9B%AE%E5%AF%BC%E5%85%A5%E6%A8%A1%E6%9D%BF.xlsx'
+    fileUrl: 'http://mooctest-crowd-service.oss-cn-hangzhou.aliyuncs.com/Others/%E9%A1%B9%E7%9B%AE%E6%95%B0%E6%8D%AE%E4%B8%8A%E6%8A%A5%E6%A8%A1%E6%9D%BF.xlsx'
   }
   new Promise((resolve) => {
     resolve(data)