fix: 表格导入项目

src/components/authen/AgencyAuthentication.vue

@@ -39,10 +39,10 @@
           <el-link v-if="authentication.explain==null || authentication.explain==''" type="danger" disabled>管理员未填写
           </el-link>
         </el-form-item>
-        <el-form-item label="对公账户" prop="bankAccount">
-          <el-input v-if="isModifyMode" v-model="authentication.bankAccount"></el-input>
-          <span v-if="!isModifyMode">{{authentication.bankAccount}}</span>
-        </el-form-item>
+<!--        <el-form-item label="对公账户" prop="bankAccount">-->
+<!--          <el-input v-if="isModifyMode" v-model="authentication.bankAccount"></el-input>-->
+<!--          <span v-if="!isModifyMode">{{authentication.bankAccount}}</span>-->
+<!--        </el-form-item>-->
         <el-form-item label="地址" prop="address">
           <el-input v-if="isModifyMode" v-model="authentication.address"></el-input>
           <span v-if="!isModifyMode">{{authentication.address}}</span>

src/components/authen/AgencyAuthenticationCreate.vue

@@ -27,10 +27,10 @@
         <!--<el-input v-if="isModifyMode" v-model="authentication.mobile"></el-input>-->
         <!--&lt;!&ndash;<span v-if="!isModifyMode">{{authentication.name}}</span>&ndash;&gt;-->
         <!--</el-form-item>-->
-        <el-form-item label="银行卡账户" prop="bankAccount">
-          <el-input size="small" v-if="isModifyMode" v-model="authentication.bankAccount"></el-input>
-          <!--<span v-if="!isModifyMode">{{authentication.bankAccount}}</span>-->
-        </el-form-item>
+<!--        <el-form-item label="银行卡账户" prop="bankAccount">-->
+<!--          <el-input size="small" v-if="isModifyMode" v-model="authentication.bankAccount"></el-input>-->
+<!--          &lt;!&ndash;<span v-if="!isModifyMode">{{authentication.bankAccount}}</span>&ndash;&gt;-->
+<!--        </el-form-item>-->
         <el-form-item label="地址" prop="address">
           <el-input size="small" v-if="isModifyMode" v-model="authentication.address"></el-input>
           <!--<span v-if="!isModifyMode">{{authentication.address}}</span>-->

src/components/authen/AuthenticationIndex.vue

@@ -12,15 +12,15 @@
             </div>
           </el-card>
         </el-col>
-        <el-col :span="6">
-          <el-card :body-style="{ padding: '0px' }" style="cursor: pointer;">
-            <i class="el-icon-s-cooperation image" style="color:#909399" @click="toEnterpriseAuthentication"></i>
-            <div style="text-align: center;font-size: 12px"><span>认证为企业用户，可以创建项目</span></div>
-            <div @click="toEnterpriseAuthentication" style="padding: 14px;text-align: center;font-size: 20px">
-              <span>企业认证</span>
-            </div>
-          </el-card>
-        </el-col>
+<!--        <el-col :span="6">-->
+<!--          <el-card :body-style="{ padding: '0px' }" style="cursor: pointer;">-->
+<!--            <i class="el-icon-s-cooperation image" style="color:#909399" @click="toEnterpriseAuthentication"></i>-->
+<!--            <div style="text-align: center;font-size: 12px"><span>认证为企业用户，可以创建项目</span></div>-->
+<!--            <div @click="toEnterpriseAuthentication" style="padding: 14px;text-align: center;font-size: 20px">-->
+<!--              <span>企业认证</span>-->
+<!--            </div>-->
+<!--          </el-card>-->
+<!--        </el-col>-->
         <el-col :span="6">
           <el-card :body-style="{ padding: '0px' }" style="cursor: pointer;">
             <i class="el-icon-s-tools image" style="color:#909399;" @click="toAgencyAuthentication"></i>

src/components/authen/AuthenticationManage.vue

@@ -75,13 +75,13 @@
             <span>
               <el-image
                 style="width: 100px;"
-                :src="authInfoDetail.IDCardPhoto"
+                :src="authInfoDetail.IDCardPositivePhoto"
                 fit="scale-down"></el-image>
             </span>
           </el-form-item>
-          <el-form-item label="银行账号：">
-            <span>{{authInfoDetail.bankAccount}}</span>
-          </el-form-item>
+<!--          <el-form-item label="银行账号：">-->
+<!--            <span>{{authInfoDetail.bankAccount}}</span>-->
+<!--          </el-form-item>-->
           <el-form-item label="地址：">
             <span>{{authInfoDetail.address}}</span>
           </el-form-item>
@@ -182,7 +182,7 @@
                     type: '',
                     realName: '',
                     IDCard: '',
-                    IDCardPhoto: '',
+                    IDCardPositivePhoto: '',
                     bankAccount: '',
                     address: '',
                     applyTime: '',
@@ -243,6 +243,7 @@
             handleAuthenticationPass (userId, type) {
                 this.showLoading()
                 checkPassAuth(type, userId, this.handleAuthenticationPassSuccess, this.handleAuthenticationPassFail)
+                this.showDialog = false
                 // item.status = this.authenticationStatusPass
                 // console.log('通过')
             },
@@ -321,7 +322,7 @@
                 console.log(res)
                 this.authInfoDetail.realName = res.realName
                 this.authInfoDetail.IDCard = res.idcard
-                this.authInfoDetail.IDCardPhoto = res.idcardPhoto
+                this.authInfoDetail.IDCardPositivePhoto = res.idCardPositivePhotoi
                 this.authInfoDetail.bankAccount = res.bankAccount
                 this.authInfoDetail.address = res.address
                 this.authInfoDetail.applyTime = res.applyTime

src/components/authen/EnterpriseAuthentication.vue

@@ -44,10 +44,10 @@
           <el-input v-if="isModifyMode" v-model="authentication.legalPersonName"></el-input>
           <span v-if="!isModifyMode">{{authentication.legalPersonName}}</span>
         </el-form-item>
-        <el-form-item label="对公账户" prop="bankAccount">
-          <el-input v-if="isModifyMode" v-model="authentication.bankAccount"></el-input>
-          <span v-if="!isModifyMode">{{authentication.bankAccount}}</span>
-        </el-form-item>
+<!--        <el-form-item label="对公账户" prop="bankAccount">-->
+<!--          <el-input v-if="isModifyMode" v-model="authentication.bankAccount"></el-input>-->
+<!--          <span v-if="!isModifyMode">{{authentication.bankAccount}}</span>-->
+<!--        </el-form-item>-->
         <el-form-item label="统一社会信用代码" prop="unifiedSocialCreditCode">
           <el-input v-if="isModifyMode" v-model="authentication.unifiedSocialCreditCode"></el-input>
           <span v-if="!isModifyMode">{{authentication.unifiedSocialCreditCode}}</span>

src/components/authen/EnterpriseAuthenticationCreate.vue

@@ -27,10 +27,10 @@
           <el-input size="small" v-if="isModifyMode" v-model="authentication.legalPersonName"></el-input>
           <!--<span v-if="!isModifyMode">{{authentication.name}}</span>-->
         </el-form-item>
-        <el-form-item label="对公账户" prop="bankAccount">
-          <el-input size="small" v-if="isModifyMode" v-model="authentication.bankAccount"></el-input>
-          <!--<span v-if="!isModifyMode">{{authentication.name}}</span>-->
-        </el-form-item>
+<!--        <el-form-item label="对公账户" prop="bankAccount">-->
+<!--          <el-input size="small" v-if="isModifyMode" v-model="authentication.bankAccount"></el-input>-->
+<!--          &lt;!&ndash;<span v-if="!isModifyMode">{{authentication.name}}</span>&ndash;&gt;-->
+<!--        </el-form-item>-->
         <el-form-item label="统一社会信用代码" prop="unifiedSocialCreditCode">
           <el-input size="small" v-if="isModifyMode" v-model="authentication.unifiedSocialCreditCode"></el-input>
           <!--<span v-if="!isModifyMode">{{authentication.bankAccount}}</span>-->

src/components/authen/IndividualAuthentication.vue

@@ -7,7 +7,7 @@
           <el-input v-if="isModifyMode" v-model="authentication.realName"></el-input>
           <span v-if="!isModifyMode">{{authentication.realName}}</span>
         </el-form-item>
-        <el-form-item prop="IDCardPhoto" label="手持身份证照片">
+        <el-form-item prop="IDCardPositivePhoto" label="手持身份证照片">
           <el-upload
             v-if="isModifyMode"
             class="avatar-uploader"
@@ -15,13 +15,13 @@
             :show-file-list="false"
             :http-request="uploadFile"
             :before-upload="beforeFileUpload">
-            <img v-if="authentication.IDCardPhoto" :src="authentication.IDCardPhoto" class="avatar">
+            <img v-if="authentication.IDCardPositivePhoto" :src="authentication.IDCardPositivePhoto" class="avatar">
             <i v-else class="el-icon-plus avatar-uploader-icon"></i>
           </el-upload>
           <span v-if="!isModifyMode">
           <el-image
             style="width: 100px;"
-            :src="authentication.IDCardPhoto"
+            :src="authentication.IDCardPositivePhoto"
             fit="scale-down"></el-image>
         </span>
         </el-form-item>
@@ -39,10 +39,10 @@
           <el-link v-if="authentication.explain==null || authentication.explain==''" type="danger" disabled>管理员未填写
           </el-link>
         </el-form-item>
-        <el-form-item label="银行卡账户" prop="bankAccount">
-          <el-input v-if="isModifyMode" v-model="authentication.bankAccount"></el-input>
-          <span v-if="!isModifyMode">{{authentication.bankAccount}}</span>
-        </el-form-item>
+<!--        <el-form-item label="银行卡账户" prop="bankAccount">-->
+<!--          <el-input v-if="isModifyMode" v-model="authentication.bankAccount"></el-input>-->
+<!--          <span v-if="!isModifyMode">{{authentication.bankAccount}}</span>-->
+<!--        </el-form-item>-->
         <el-form-item label="地址" prop="address">
           <el-input v-if="isModifyMode" v-model="authentication.address"></el-input>
           <span v-if="!isModifyMode">{{authentication.address}}</span>
@@ -88,7 +88,7 @@ export default {
       loading: false,
       isModifyMode: false,
       authentication: {
-        IDCardPhoto: defaultValue.image,
+        IDCardPositivePhoto: defaultValue.image,
         realName: '',
         IDCard: '',
         bankAccount: '',
@@ -104,7 +104,7 @@ export default {
         realName: [
           {required: true, message: '请输入身份证上的姓名', trigger: 'blur'},
         ],
-        IDCardPhoto: [
+        IDCardPositivePhoto: [
             {
                 validator: (rule, value, callback) => {
                     console.log(value);
@@ -161,7 +161,7 @@ export default {
     },
     getAuthInfoSuccess (res) {
       this.hideLoading()
-      this.authentication.IDCardPhoto = res.idcardPhoto == null ? defaultValue.image : res.idcardPhoto
+      this.authentication.IDCardPositivePhoto = res.idCardPositivePhotoi == null ? defaultValue.image : res.idCardPositivePhotoi
       this.authentication.realName = res.realName == null ? '暂未填写' : res.realName
       this.authentication.IDCard = res.idcard == null ? '暂未填写' : res.idcard
       this.authentication.bankAccount = res.bankAccount == null ? '暂未填写' : res.bankAccount
@@ -190,7 +190,7 @@ export default {
             realName: this.authentication.realName,
             bankAccount: this.authentication.bankAccount,
             address: this.authentication.address,
-            IDCardPhoto: this.authentication.IDCardPhoto,
+            IDCardPositivePhoto: this.authentication.IDCardPositivePhoto,
             IDCard: this.authentication.IDCard,
           }
           //console.log(newAuthentication)
@@ -204,7 +204,7 @@ export default {
     },
     updateAuthInfoSuccess (res) {
       this.hideLoading()
-      this.authentication.IDCardPhoto = res.idcardPhoto == null ? defaultValue.image : res.idcardPhoto
+      this.authentication.IDCardPositivePhoto = res.idCardPositivePhotoi == null ? defaultValue.image : res.idCardPositivePhotoi
       this.authentication.realName = res.realName == null ? '暂未填写' : res.realName
       this.authentication.IDCard = res.idcard == null ? '暂未填写' : res.idcard
       this.authentication.bankAccount = res.bankAccount == null ? '暂未填写' : res.bankAccount
@@ -282,10 +282,10 @@ export default {
       Http.upload(Apis.FILE.UPLOAD_IMAGE.replace('{userId}', this.user.userVO.id), formData, config).then((res) => {
         this.hideLoading()
         console.log('上传成功')
-        this.authentication.IDCardPhoto = res.data
+        this.authentication.IDCardPositivePhoto = res.data
         console.log(res.data)
         notify('success', '上传成功')
-        this.$refs['authentication'].validateField('IDCardPhoto');
+        this.$refs['authentication'].validateField('IDCardPositivePhoto');
 
       }).catch(error => {
         this.hideLoading()

src/components/authen/IndividualAuthenticationCreate.vue

@@ -7,7 +7,7 @@
           <el-input size="small" v-if="isModifyMode" v-model="authentication.realName"></el-input>
           <!--<span v-if="!isModifyMode">{{authentication.name}}</span>-->
         </el-form-item>
-        <el-form-item prop="IDCardPhoto" label="手持身份证照片">
+        <el-form-item prop="IDCardPositivePhoto" label="手持身份证照片">
           <el-upload
             class="avatar-uploader"
             action=""
@@ -15,7 +15,7 @@
             accept=".jpg,.png"
             :http-request="uploadFile"
             :before-upload="beforeFileUpload">
-            <img v-if="authentication.IDCardPhoto" :src="authentication.IDCardPhoto" class="avatar">
+            <img v-if="authentication.IDCardPositivePhoto" :src="authentication.IDCardPositivePhoto" class="avatar">
             <i v-else class="el-icon-plus avatar-uploader-icon"></i>
           </el-upload>
           <!--<div v-if="!isModifyMode">-->
@@ -29,10 +29,10 @@
           <!--<span v-if="!isModifyMode">{{authentication.name}}</span>-->
         </el-form-item>
 
-        <el-form-item label="银行卡账户" prop="bankAccount">
-          <el-input size="small" v-if="isModifyMode" v-model="authentication.bankAccount"></el-input>
-          <!--<span v-if="!isModifyMode">{{authentication.bankAccount}}</span>-->
-        </el-form-item>
+<!--        <el-form-item label="银行卡账户" prop="bankAccount">-->
+<!--          <el-input size="small" v-if="isModifyMode" v-model="authentication.bankAccount"></el-input>-->
+<!--          &lt;!&ndash;<span v-if="!isModifyMode">{{authentication.bankAccount}}</span>&ndash;&gt;-->
+<!--        </el-form-item>-->
         <el-form-item label="地址" prop="address">
           <el-input size="small" v-if="isModifyMode" v-model="authentication.address"></el-input>
           <!--<span v-if="!isModifyMode">{{authentication.address}}</span>-->
@@ -76,7 +76,7 @@ export default {
       isModifyMode: true,
       loading: false,
       authentication: {
-        IDCardPhoto: '',
+        IDCardPositivePhoto: '',
         realName: '',
         IDCard: '',
         bankAccount: '',
@@ -90,7 +90,7 @@ export default {
         realName: [
           {required: true, message: '请输入身份证上的姓名', trigger: 'blur'},
         ],
-        IDCardPhoto: [
+        IDCardPositivePhoto: [
             {
                 validator: (rule, value, callback) => {
                     console.log(value);
@@ -150,7 +150,7 @@ export default {
             userId: this.user.userVO.id,
             realName: this.authentication.realName,
             IDCard: this.authentication.IDCard,
-            IDCardPhoto: this.authentication.IDCardPhoto,
+            IDCardPositivePhoto: this.authentication.IDCardPositivePhoto,
             bankAccount: this.authentication.bankAccount,
             address: this.authentication.address
           }
@@ -242,9 +242,9 @@ export default {
       formData.append('file', param.file)
       Http.upload(Apis.FILE.UPLOAD_IMAGE.replace('{userId}', this.user.userVO.id), formData, config).then((res) => {
         this.hideLoading()
-        this.authentication.IDCardPhoto = res.data
+        this.authentication.IDCardPositivePhoto = res.data
         notify('success', '上传成功')
-        this.$refs['authentication'].validateField('IDCardPhoto');
+        this.$refs['authentication'].validateField('IDCardPositivePhoto');
       }).catch(error => {
         this.hideLoading()
         try {

src/components/cheat/AgencyAdd.vue

@@ -15,10 +15,10 @@
           <el-input v-if="isModifyMode" v-model="agency.email"></el-input>
           <!--<span v-if="!isModifyMode">{{agency.name}}</span>-->
         </el-form-item>
-        <el-form-item size="small" label="银行卡账户" prop="bankAccount">
-          <el-input v-if="isModifyMode" v-model="agency.bankAccount"></el-input>
-          <!--<span v-if="!isModifyMode">{{agency.bankAccount}}</span>-->
-        </el-form-item>
+<!--        <el-form-item size="small" label="银行卡账户" prop="bankAccount">-->
+<!--          <el-input v-if="isModifyMode" v-model="agency.bankAccount"></el-input>-->
+<!--          &lt;!&ndash;<span v-if="!isModifyMode">{{agency.bankAccount}}</span>&ndash;&gt;-->
+<!--        </el-form-item>-->
         <el-form-item size="small" label="地址" prop="address">
           <el-input v-if="isModifyMode" v-model="agency.address"></el-input>
           <!--<span v-if="!isModifyMode">{{agency.address}}</span>-->
@@ -104,7 +104,7 @@
               <ul style="list-style-type:none">
                 <li>机构名称：{{ agency.name }}</li>
                 <li>机构电话：{{ agency.mobile }}</li>
-                <li>银行卡账户：{{ agency.bankAccount }}</li>
+<!--                <li>银行卡账户：{{ agency.bankAccount }}</li>-->
                 <li>地址：{{ agency.address }}</li>
                 <li>邮箱：{{ agency.email }}</li>
               </ul>

src/components/cheat/ProjectAdd.vue

@@ -178,11 +178,24 @@
                 <span>{{scope.row.name}}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="platform" label="项目测试平台">
+            <el-table-column prop="platform" label="领域类型">
               <template slot-scope="scope">
-                <span v-for="item in JSON.parse(scope.row.platform)" :key="item">
-                   <el-tag type="success">{{item}}</el-tag>&nbsp;&nbsp;
-                </span>
+                <span>{{scope.row.fieldType}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="name" label="应用类型">
+              <template slot-scope="scope">
+                <span>{{scope.row.applicationType}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="platform" label="测试类型">
+              <template slot-scope="scope">
+                <span>{{scope.row.type}}</span>
+              </template>
+            </el-table-column>
+             <el-table-column prop="platform" label="委托单位">
+              <template slot-scope="scope">
+                <span>{{scope.row.entrustUnit}}</span>
               </template>
             </el-table-column>
             <el-table-column prop="linkMan" label="项目联系人">
@@ -195,33 +208,31 @@
                 <span>{{scope.row.linkManMobile}}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="type" label="项目测试类型">
+            <el-table-column prop="description" label="项目需求描述">
               <template slot-scope="scope">
-                <span v-for="item in JSON.parse(scope.row.type)" :key="item">
-                   <el-tag type="success">{{item}}</el-tag>&nbsp;&nbsp;
-                </span>
+                <span>{{scope.row.description}}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="description" label="项目需求描述">
+            <el-table-column prop="description" label="计价标准">
               <template slot-scope="scope">
-                <span>{{scope.row.description}}</span>
+                <span>{{scope.row.valuationStandard}}</span>
               </template>
             </el-table-column>
             <el-table-column prop="description" label="测试报告内容">
               <template slot-scope="scope">
-                <span>{{scope.row.description}}</span>
+                <span>{{scope.row.crowdTestReportForProject.content}}</span>
               </template>
             </el-table-column>
             <el-table-column prop="description" label="测试报告结论">
               <template slot-scope="scope">
-                <span>{{scope.row.description}}</span>
+                <span>{{scope.row.crowdTestReportForProject.conclusion}}</span>
               </template>
             </el-table-column>
     </el-table>
         </span>
             <span slot="footer" class="dialog-footer">
     <el-button @click="handleDialogClose">取消</el-button>
-    <el-button type="primary" @click="ensureSubmitExcel">确认</el-button>
+    <el-button type="primary" @click="hindDialog">确认</el-button>
   </span>
           </el-dialog>
         </el-tab-pane>
@@ -233,434 +244,438 @@
 </template>
 
 <script>
-import Http from '@/js/http.js'
-import Apis from '@/js/api.js'
-import {notify} from '@/constants/index'
-import {
-  getAllPlatformTypes,
-  getAllServiceTypes,
-  getGreenChannelAddProjectExcelTemplateFile,
-  storageGet
-} from '@/js/index'
+    import Http from '@/js/http.js'
+    import Apis from '@/js/api.js'
+    import {notify} from '@/constants/index'
+    import {
+        getAllPlatformTypes,
+        getAllServiceTypes,
+        getGreenChannelAddProjectExcelTemplateFile,
+        storageGet
+    } from '@/js/index'
 
-export default {
-  name: 'ProjectAdd',
-  data () {
-    return {
-      userId: 0,
-      user: {},
-      loading: false,
-      dialogVisible: false,
-      isModifyMode: true,
-      serviceType: [],
-      platforms: [],
-      isFormSubmit: true,
-      downloadFile: '',
-      project: {
-        name: '',
-        description: '',
-        contactName: '',
-        contactPhone: '',
-        platform: [],
-        type: [],
-        requireDoc: [],
-        requireDocUrl: '',
-        file: [],
-        fileUrl: '',
-        excelFile: [],
-        excelFileUrl: '',
-        price: '',
-        datetime: ''
-      },
-      projectList: [
-        {
-          'projectDetails': {
-            'id': 'PROJECT-2019081319025',
-            'name': '网易云测试',
-            'contactName': '孙加辉',
-            'contactPhone': '13628972489',
-            'type': [
-              1
-            ],
-            'platform': [
-              1,
-              0
-            ],
-            'desc': '无',
-            'doc': '',
-            'file': '',
-            'resource': 1,
-            'location': {
-              'provinceCode': '江苏',
-              'cityCode': '南京'
-            },
-            'institution': 1,
-            'datetime': '2019-08-13T11:14:08.192+0000',
-            'price': 30000.0,
-            'budget': 30000.0,
-            'usage': null
-          },
-          'taskList': [
-            {
-              'id': 'TASK-LDSM-2019081319013',
-              'projectId': 'PROJECT-2019081319025',
-              'title': '网易云测试-安全漏洞扫描',
-              'description': null,
-              'quotePrice': 30000.0,
-              'fixedPrice': 30000.0,
-              'resource': 0,
-              'location': {
-                'provinceCode': '江苏',
-                'cityCode': '南京'
-              },
-              'institution': 1,
-              'serviceType': 1,
-              'status': 5,
-              'datetime': '2019-08-13T11:14:08.192+0000'
+    export default {
+        name: 'ProjectAdd',
+        data() {
+            return {
+                userId: 0,
+                user: {},
+                loading: false,
+                dialogVisible: false,
+                isModifyMode: true,
+                serviceType: [],
+                platforms: [],
+                isFormSubmit: true,
+                downloadFile: '',
+                project: {
+                    name: '',
+                    description: '',
+                    contactName: '',
+                    contactPhone: '',
+                    platform: [],
+                    type: [],
+                    requireDoc: [],
+                    requireDocUrl: '',
+                    file: [],
+                    fileUrl: '',
+                    excelFile: [],
+                    excelFileUrl: '',
+                    price: '',
+                    datetime: ''
+                },
+                projectList: [{
+                    "id": null,
+                    "name": "广东省农产品商贸交易服务平台",
+                    "code": "PROJ-2020070820055",
+                    "userId": 20473,
+                    "regionalManagerId": 99222,
+                    "projectDistributionTypeId": 1,
+                    "fieldType": "KJFW",
+                    "applicationType": "WEB",
+                    "type": "GNCS",
+                    "linkMan": "张三",
+                    "linkManMobile": "13512345678",
+                    "description": "本平台提供农产品网上供求信息的发布、在线交易服务等功能，帮助用户快速捕获商机，具备开设网上交易会和网上农博会，为用户提供更广阔的宣传平台。",
+                    "projectFile": "",
+                    "requirementFile": "",
+                    "distributionProvince": "江苏",
+                    "distributionCity": "南京",
+                    "valuationStandard": "1200元/(人天）",
+                    "quotedPrice": 30000.0,
+                    "fixedPrice": 30000.0,
+                    "restPrice": null,
+                    "entrustUnit": "广东省农村信息中心",
+                    "status": 4,
+                    "deadTime": "2020-07-08T12:16:34.695+0000",
+                    "endTime": "2020-07-08T12:16:34.695+0000",
+                    "isDeleted": 0,
+                    "joinCount": 1,
+                    "createTime": null,
+                    "crowdTestTaskList": [{
+                        "id": null,
+                        "name": "广东省农产品商贸交易服务平台-GNCS",
+                        "code": "TASK-GNCS-2020070820008",
+                        "crowdTestProjectCode": "PROJ-2020070820055",
+                        "evaluationAgencyId": 1,
+                        "type": "GNCS",
+                        "description": "本平台提供农产品网上供求信息的发布、在线交易服务等功能，帮助用户快速捕获商机，具备开设网上交易会和网上农博会，为用户提供更广阔的宣传平台。",
+                        "requirementFile": "",
+                        "distributionType": 0,
+                        "distributionProvince": null,
+                        "distributionCity": null,
+                        "quotedPrice": 30000.0,
+                        "fixedPrice": 30000.0,
+                        "status": 4,
+                        "fullStatus": 0,
+                        "deadTime": "2020-07-08T12:16:34.695+0000",
+                        "endTime": "2020-07-08T12:16:34.695+0000",
+                        "isDeleted": 0,
+                        "createTime": null,
+                        "participantCount": 1,
+                        "acceptedCount": 1,
+                        "participantHasCommittedCount": 1,
+                        "acceptedUserList": [{
+                            "id": null,
+                            "taskCode": "TASK-GNCS-2020070820008",
+                            "userId": 20473,
+                            "quotedPrice": 0.0,
+                            "hasReport": 1,
+                            "distributionType": 1,
+                            "isAccepted": 1,
+                            "acceptTime": null,
+                            "isCommitted": 1,
+                            "user": null,
+                            "commitTaskTime": "2020-07-08T12:16:34.695+0000",
+                            "commitReportTime": "2020-07-08T12:16:34.695+0000",
+                            "crowdTestReportList": [{
+                                "id": null,
+                                "name": "广东省农产品商贸交易服务平台-GNCS测试报告",
+                                "code": "REPORT-2020070820089",
+                                "userId": 20473,
+                                "dependencyCode": "TASK-GNCS-2020070820008",
+                                "type": "测试报告",
+                                "scope": 1,
+                                "testObject": null,
+                                "description": null,
+                                "content": "对平台的供求信息发布、在线交易、网上上交易会等模块进行了功能性测试，所有测试项均符合项目需求规格说明书的要求",
+                                "file": null,
+                                "conclusion": "通过",
+                                "isDeleted": 0,
+                                "createTime": null
+                            }]
+                        }]
+                    }],
+                    "crowdTestReportForProject": {
+                        "id": null,
+                        "name": "广东省农产品商贸交易服务平台测试报告",
+                        "code": "REPORT-2020070820090",
+                        "userId": null,
+                        "dependencyCode": "PROJ-2020070820055",
+                        "type": "GNCS",
+                        "scope": 0,
+                        "testObject": "广东省农产品商贸交易服务平台",
+                        "description": "本平台提供农产品网上供求信息的发布、在线交易服务等功能，帮助用户快速捕获商机，具备开设网上交易会和网上农博会，为用户提供更广阔的宣传平台。",
+                        "content": "对平台的供求信息发布、在线交易、网上上交易会等模块进行了功能性测试，所有测试项均符合项目需求规格说明书的要求",
+                        "file": null,
+                        "conclusion": "通过",
+                        "isDeleted": 0,
+                        "createTime": null
+                    }
+                }],
+                excelFile: {},
+                rules: {
+                    // name: [
+                    //   {required: true, message: '请输入报告名称', trigger: 'blur'}
+                    //   // { min: 3, max: 5, message: "长度在 3 到 5 个字符", trigger: "blur" }
+                    // ],
+                    // abstract: [
+                    //   {
+                    //     required: true,
+                    //     message: '请输入摘要信息',
+                    //     trigger: 'change'
+                    //   }
+                    // ],
+                    // type: [
+                    //   {required: true, message: '请选择报告类型', trigger: 'change'}
+                    // ],
+                    // conclusion: [
+                    //   {required: true, message: '请输入报告结论', trigger: 'blur'}
+                    // ]
+                },
+                pickerOptions: {
+                    shortcuts: [
+                        {
+                            text: '今天',
+                            onClick(picker) {
+                                picker.$emit('pick', new Date())
+                            }
+                        },
+                        {
+                            text: '昨天',
+                            onClick(picker) {
+                                const date = new Date()
+                                date.setTime(date.getTime() - 3600 * 1000 * 24)
+                                picker.$emit('pick', date)
+                            }
+                        },
+                        {
+                            text: '一周前',
+                            onClick(picker) {
+                                const date = new Date()
+                                date.setTime(date.getTime() - 3600 * 1000 * 24 * 7)
+                                picker.$emit('pick', date)
+                            }
+                        }
+                    ]
+                },
+                tableData: [{
+                    date: '2016-05-02',
+                    name: '王小虎',
+                    address: '上海市普陀区金沙江路 1518 弄'
+                }, {
+                    date: '2016-05-04',
+                    name: '王小虎',
+                    address: '上海市普陀区金沙江路 1517 弄'
+                }, {
+                    date: '2016-05-01',
+                    name: '王小虎',
+                    address: '上海市普陀区金沙江路 1519 弄'
+                }, {
+                    date: '2016-05-03',
+                    name: '王小虎',
+                    address: '上海市普陀区金沙江路 1516 弄'
+                }]
             }
-          ],
-          'reportList': null
         },
-        {
-          'projectDetails': {
-            'id': 'PROJECT-2019081319026',
-            'name': '网易测试',
-            'contactName': '孙加辉',
-            'contactPhone': '0797-8877663',
-            'type': [
-              4,
-              3
-            ],
-            'platform': [
-              2
-            ],
-            'desc': '无',
-            'doc': '',
-            'file': '',
-            'resource': 1,
-            'location': {
-              'provinceCode': '江苏',
-              'cityCode': '南京'
+        mounted() {
+            this.$nextTick(() => {
+                this.init()
+            })
+        },
+        methods: {
+            init() {
+                this.setServiceType()
+                this.setPlatformType()
+                this.setUserInfo()
+                this.setTemplateExcel()
             },
-            'institution': 1,
-            'datetime': '2019-08-13T11:14:08.194+0000',
-            'price': 30000.0,
-            'budget': 30000.0,
-            'usage': null
-          },
-          'taskList': [
-            {
-              'id': 'TASK-GNCS-2019081319006',
-              'projectId': 'PROJECT-2019081319026',
-              'title': '网易测试-功能测试',
-              'description': null,
-              'quotePrice': 30000.0,
-              'fixedPrice': 30000.0,
-              'resource': 0,
-              'location': {
-                'provinceCode': '江苏',
-                'cityCode': '南京'
-              },
-              'institution': 1,
-              'serviceType': 4,
-              'status': 5,
-              'datetime': '2019-08-13T11:14:08.194+0000'
-            }
-          ],
-          'reportList': null
-        }
-      ],
-      excelFile: {},
-      rules: {
-        // name: [
-        //   {required: true, message: '请输入报告名称', trigger: 'blur'}
-        //   // { min: 3, max: 5, message: "长度在 3 到 5 个字符", trigger: "blur" }
-        // ],
-        // abstract: [
-        //   {
-        //     required: true,
-        //     message: '请输入摘要信息',
-        //     trigger: 'change'
-        //   }
-        // ],
-        // type: [
-        //   {required: true, message: '请选择报告类型', trigger: 'change'}
-        // ],
-        // conclusion: [
-        //   {required: true, message: '请输入报告结论', trigger: 'blur'}
-        // ]
-      },
-      pickerOptions: {
-        shortcuts: [
-          {
-            text: '今天',
-            onClick (picker) {
-              picker.$emit('pick', new Date())
-            }
-          },
-          {
-            text: '昨天',
-            onClick (picker) {
-              const date = new Date()
-              date.setTime(date.getTime() - 3600 * 1000 * 24)
-              picker.$emit('pick', date)
+            //加载数据
+            loadData: function () {
+            },
+            modifyInfo() {
+                this.isModifyMode = true
+            },
+            submitInfo() {
+                //this.isModifyMode = false
+                this.showLoading()
+                const newProject = {
+                    userId: this.user.userVO.id,
+                    name: this.project.name,
+                    description: this.project.description,
+                    contactName: this.project.contactName,
+                    contactPhone: this.project.contactPhone,
+                    platform: this.project.platform,
+                    type: this.project.type,
+                    doc: this.project.requireDocUrl,
+                    file: this.project.fileUrl,
+                    price: this.project.price,
+                    datetime: this.project.datetime
+                }
+                Http.post(Apis.PROJECT.ADD_PROJECT, newProject).then((res) => {
+                    this.hideLoading()
+                    this.createProjectByFormSuccessConfirm()
+                    console.log(res)
+                }).catch(error => {
+                    this.hideLoading()
+                    notify('error', error.data)
+                })
+            },
+            // cancelModify () {
+            //   this.isModifyMode = false
+            // },
+            handleRemove(file, fileList) {
+                console.log(file, fileList)
+            },
+            handleExceed(files, fileList) {
+                this.$message.warning(
+                    `当前限制选择 1 个文件，本次选择了 ${
+                        files.length
+                    } 个文件，共选择了 ${files.length + fileList.length} 个文件`
+                )
+            },
+            beforeRemove(file, fileList) {
+                //return this.$confirm(`确定移除 ${file.name}？`)
+            },
+            beforeFileUpload() {
+
+            },
+            uploadProjectCreateExcelFile(param) {
+                this.showLoading()
+                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_PRE.replace('{userId}', this.user.userVO.id), formData, config).then((res) => {
+                    console.log(res)
+                    this.projectList = res.data
+                    this.hideLoading()
+                    this.showDialog()
+                    //notify('success', '项目添加成功')
+                }).catch(error => {
+                    console.log("打印错误信息！！！");
+                    console.log(error);
+                    console.log(error.data);
+                    notify('error', error)
+                    this.hideLoading()
+                })
+            },
+            uploadRequireDoc(param) {
+                const formData = new FormData()
+                let config = {
+                    //添加请求头
+                    headers: {'Content-Type': 'multipart/form-data'},
+                }
+                formData.append('file', param.file)
+                Http.upload(Apis.FILE.REQUIREMENT_FILE.replace('{userId}', this.user.userVO.id), formData, config).then((res) => {
+                    console.log('上传成功')
+                    this.project.requireDocUrl = res.data
+                    console.log(res.data)
+                    notify('success', '上传成功')
+                }).catch(error => {
+                    notify('error', error.data)
+                })
+            },
+            uploadApkFile(param) {
+                const formData = new FormData()
+                let config = {
+                    //添加请求头
+                    headers: {'Content-Type': 'multipart/form-data'},
+                }
+                formData.append('file', param.file)
+                Http.upload(Apis.FILE.APK.replace('{userId}', this.user.userVO.id), formData, config).then((res) => {
+                    console.log('上传成功')
+                    this.project.fileUrl = res.data
+                    console.log(res)
+                    notify('success', '上传成功')
+                }).catch(error => {
+                    notify('error', error.data)
+                })
+            },
+            handleDialogClose(done) {
+                this.hideDialog()
+                this.project.excelFile = []
+                // this.$confirm('确认退出？退出前请记录下登录账号和密码，否则无法找回！！！')
+                //   .then(_ => {
+                //     //done()
+                //     this.hideDialog()
+                //   })
+                //   .catch(_ => {
+                //   })
+            },
+            hindDialog(){
+                this.hideDialog()
+            },
+            ensureSubmitExcel() {
+                this.hideDialog()
+                this.showLoading()
+                this.project.excelFile = []
+                Http.post(Apis.PROJECT.ADD_PROJECT_BY_EXCEL, this.projectList).then((res) => {
+                    notify('success', '添加成功')
+                    this.hideLoading()
+                }).catch((error) => {
+                    notify('error', error.data)
+                    this.hideLoading()
+                })
+            },
+            showDialog() {
+                this.dialogVisible = true
+            },
+            hideDialog() {
+                this.dialogVisible = false
+                //this.resetForm()
+            },
+            setServiceType() {
+                getAllServiceTypes().then((res) => {
+                    this.serviceType = res
+                }).catch((error) => {
+                    notify('error', '获取服务类型出错')
+                })
+            },
+            setPlatformType() {
+                this.platforms = getAllPlatformTypes()
+            },
+            createProjectByFormSuccessConfirm() {
+                this.$confirm('项目创建成功，是否跳转至主页?', '提示', {
+                    confirmButtonText: '跳转至主页',
+                    cancelButtonText: '继续创建项目',
+                    type: 'success'
+                }).then(() => {
+                    this.$router.push({
+                        name: 'Home',
+                        // params: {projectId: projectId, taskId: taskId}
+                    })
+                    // this.$message({
+                    //   type: 'success',
+                    //   message: '删除成功!'
+                    // });
+                }).catch(() => {
+                    this.resetForm()
+                    // this.$message({
+                    //   type: 'info',
+                    //   message: '已取消删除'
+                    // });
+                })
+            },
+            resetForm() {
+                this.project = {
+                    name: '',
+                    description: '',
+                    contactName: '',
+                    contactPhone: '',
+                    platform: [],
+                    type: [],
+                    requireDoc: [],
+                    requireDocUrl: '',
+                    file: [],
+                    fileUrl: '',
+                    excelFile: [],
+                    excelFileUrl: '',
+                    price: '',
+                    datetime: ''
+                }
+            },
+            setUserInfo() {
+                this.user = storageGet('user')
+            },
+            setTemplateExcel() {
+                this.showLoading()
+                getGreenChannelAddProjectExcelTemplateFile(this.setTemplateExcelSuccess, this.setTemplateExcelFail)
+            },
+            setTemplateExcelSuccess(res) {
+                this.hideLoading()
+                this.downloadFile = res.fileUrl
+            },
+            setTemplateExcelFail(error) {
+                this.hideLoading()
+                notify('error', '加载模板文件失败：' + error.data)
+            },
+            showLoading() {
+                this.loading = true
+            },
+            hideLoading() {
+                this.loading = false
             }
-          },
-          {
-            text: '一周前',
-            onClick (picker) {
-              const date = new Date()
-              date.setTime(date.getTime() - 3600 * 1000 * 24 * 7)
-              picker.$emit('pick', date)
+        },
+        watch: {
+            serviceType(val) {
+                this.serviceType = val
             }
-          }
-        ]
-      },
-      tableData: [{
-        date: '2016-05-02',
-        name: '王小虎',
-        address: '上海市普陀区金沙江路 1518 弄'
-      }, {
-        date: '2016-05-04',
-        name: '王小虎',
-        address: '上海市普陀区金沙江路 1517 弄'
-      }, {
-        date: '2016-05-01',
-        name: '王小虎',
-        address: '上海市普陀区金沙江路 1519 弄'
-      }, {
-        date: '2016-05-03',
-        name: '王小虎',
-        address: '上海市普陀区金沙江路 1516 弄'
-      }]
-    }
-  },
-  mounted () {
-    this.$nextTick(() => {
-      this.init()
-    })
-  },
-  methods: {
-    init () {
-      this.setServiceType()
-      this.setPlatformType()
-      this.setUserInfo()
-      this.setTemplateExcel()
-    },
-    //加载数据
-    loadData: function () {
-    },
-    modifyInfo () {
-      this.isModifyMode = true
-    },
-    submitInfo () {
-      //this.isModifyMode = false
-      this.showLoading()
-      const newProject = {
-        userId: this.user.userVO.id,
-        name: this.project.name,
-        description: this.project.description,
-        contactName: this.project.contactName,
-        contactPhone: this.project.contactPhone,
-        platform: this.project.platform,
-        type: this.project.type,
-        doc: this.project.requireDocUrl,
-        file: this.project.fileUrl,
-        price: this.project.price,
-        datetime: this.project.datetime
-      }
-      Http.post(Apis.PROJECT.ADD_PROJECT, newProject).then((res) => {
-        this.hideLoading()
-        this.createProjectByFormSuccessConfirm()
-        console.log(res)
-      }).catch(error => {
-        this.hideLoading()
-        notify('error', error.data)
-      })
-    },
-    // cancelModify () {
-    //   this.isModifyMode = false
-    // },
-    handleRemove (file, fileList) {
-      console.log(file, fileList)
-    },
-    handleExceed (files, fileList) {
-      this.$message.warning(
-        `当前限制选择 1 个文件，本次选择了 ${
-          files.length
-          } 个文件，共选择了 ${files.length + fileList.length} 个文件`
-      )
-    },
-    beforeRemove (file, fileList) {
-      //return this.$confirm(`确定移除 ${file.name}？`)
-    },
-    beforeFileUpload () {
-
-    },
-    uploadProjectCreateExcelFile (param) {
-      this.showLoading()
-      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_PRE.replace('{userId}', this.user.userVO.id), formData, config).then((res) => {
-        console.log(res)
-        console.log(res.data[0].platform)
-        console.log(typeof res.data[0].platform)
-        console.log(typeof JSON.parse(res.data[0].platform))
-        console.log(JSON.parse(res.data[0].platform))
-        this.projectList = res.data
-        this.hideLoading()
-        this.showDialog()
-        //notify('success', '项目添加成功')
-      }).catch(error => {
-        notify('error', error)
-        this.hideLoading()
-      })
-    },
-    uploadRequireDoc (param) {
-      const formData = new FormData()
-      let config = {
-        //添加请求头
-        headers: {'Content-Type': 'multipart/form-data'},
-      }
-      formData.append('file', param.file)
-      Http.upload(Apis.FILE.REQUIREMENT_FILE.replace('{userId}', this.user.userVO.id), formData, config).then((res) => {
-        console.log('上传成功')
-        this.project.requireDocUrl = res.data
-        console.log(res.data)
-        notify('success', '上传成功')
-      }).catch(error => {
-        notify('error', error.data)
-      })
-    },
-    uploadApkFile (param) {
-      const formData = new FormData()
-      let config = {
-        //添加请求头
-        headers: {'Content-Type': 'multipart/form-data'},
-      }
-      formData.append('file', param.file)
-      Http.upload(Apis.FILE.APK.replace('{userId}', this.user.userVO.id), formData, config).then((res) => {
-        console.log('上传成功')
-        this.project.fileUrl = res.data
-        console.log(res)
-        notify('success', '上传成功')
-      }).catch(error => {
-        notify('error', error.data)
-      })
-    },
-    handleDialogClose (done) {
-      this.hideDialog()
-      this.project.excelFile = []
-      // this.$confirm('确认退出？退出前请记录下登录账号和密码，否则无法找回！！！')
-      //   .then(_ => {
-      //     //done()
-      //     this.hideDialog()
-      //   })
-      //   .catch(_ => {
-      //   })
-    },
-    ensureSubmitExcel () {
-      this.hideDialog()
-      this.showLoading()
-      Http.post(Apis.PROJECT.ADD_PROJECT_BY_EXCEL, this.projectList).then((res) => {
-        notify('success', '添加成功')
-        this.hideLoading()
-      }).catch((error) => {
-        notify('error', error.data)
-        this.hideLoading()
-      })
-    },
-    showDialog () {
-      this.dialogVisible = true
-    },
-    hideDialog () {
-      this.dialogVisible = false
-      //this.resetForm()
-    },
-    setServiceType () {
-      getAllServiceTypes().then((res) => {
-        this.serviceType = res
-      }).catch((error) => {
-        notify('error', '获取服务类型出错')
-      })
-    },
-    setPlatformType () {
-      this.platforms = getAllPlatformTypes()
-    },
-    createProjectByFormSuccessConfirm () {
-      this.$confirm('项目创建成功，是否跳转至主页?', '提示', {
-        confirmButtonText: '跳转至主页',
-        cancelButtonText: '继续创建项目',
-        type: 'success'
-      }).then(() => {
-        this.$router.push({
-          name: 'Home',
-          // params: {projectId: projectId, taskId: taskId}
-        })
-        // this.$message({
-        //   type: 'success',
-        //   message: '删除成功!'
-        // });
-      }).catch(() => {
-        this.resetForm()
-        // this.$message({
-        //   type: 'info',
-        //   message: '已取消删除'
-        // });
-      })
-    },
-    resetForm () {
-      this.project = {
-        name: '',
-        description: '',
-        contactName: '',
-        contactPhone: '',
-        platform: [],
-        type: [],
-        requireDoc: [],
-        requireDocUrl: '',
-        file: [],
-        fileUrl: '',
-        excelFile: [],
-        excelFileUrl: '',
-        price: '',
-        datetime: ''
-      }
-    },
-    setUserInfo () {
-      this.user = storageGet('user')
-    },
-    setTemplateExcel () {
-      this.showLoading()
-      getGreenChannelAddProjectExcelTemplateFile(this.setTemplateExcelSuccess, this.setTemplateExcelFail)
-    },
-    setTemplateExcelSuccess (res) {
-      this.hideLoading()
-      this.downloadFile = res.fileUrl
-    },
-    setTemplateExcelFail (error) {
-      this.hideLoading()
-      notify('error', '加载模板文件失败：' + error.data)
-    },
-    showLoading () {
-      this.loading = true
-    },
-    hideLoading () {
-      this.loading = false
-    }
-  },
-  watch: {
-    serviceType (val) {
-      this.serviceType = val
+        },
+        created: function () {
+        }
     }
-  },
-  created: function () {
-  }
-}
 </script>
 
 <style scoped>

src/components/project/Project.vue

@@ -32,6 +32,12 @@
               </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>
+              <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>
@@ -49,6 +55,19 @@
             <!--</el-input>-->
             <!--<span v-if="!isModifyMode">{{project.price}}¥</span>-->
             <!--</el-form-item>-->
+            <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>
+            </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">
@@ -160,6 +179,18 @@
             <i v-if="project.fileUrl==null || project.fileUrl==''" class="el-icon-document">暂无文件</i>
           </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-form-item>
             <el-form-item label="项目截止时间" prop="datetime">
               <div class="block" v-if="isModifyMode">
                 <el-date-picker
@@ -283,6 +314,7 @@ import {
   ensureEndProject,
   getAllInstitutions,
   getAllPlatformTypes,
+  getAllFields,
   getAllServiceTypes,
   getFormalTimeFromDate,
   getProvinceCodeByProvinceName,
@@ -321,6 +353,7 @@ export default {
       institutionArray: [],
       isModifyMode: false,
       platforms: [],
+      fields: [],
       resourceType: ResourceType,
       serviceType: [],
       projectOperationControl: {
@@ -337,6 +370,9 @@ export default {
         name: '',
         type: '',
         platform: '',
+        valuationStandard: '',
+        entrustUnit:'',
+        field: '',
         desc: '',
         resource: '',
         location: '',
@@ -418,10 +454,17 @@ export default {
         platform: [
           {
             required: true,
-            message: '请至少选择一个平台',
+            message: '请选择一个应用类型',
             trigger: 'change'
           }
         ],
+        field: [
+            {
+                required: true,
+                message: '请选择一个领域类型',
+                trigger: 'change'
+            }
+        ],
         desc: [{required: false, message: '请填写描述', trigger: 'blur'}],
         //price: [{required: true, message: '请填写价格', trigger: 'blur'}],
         budget: [
@@ -570,7 +613,10 @@ export default {
             userId: this.user.userVO.id,
             name: this.project.name,
             type: this.project.type,
-            platform: this.project.platform.split('&#'),
+            platform: this.project.platform,
+            valuationStandard: this.project.valuationStandard,
+            entrustUnit: this.project.entrustUnit,
+            field: this.project.field,
             desc: this.project.desc,
             resource: this.project.resource,
             location: getProvinceNameByProvinceCode(this.project.location.provinceCode, this.project.location.cityCode),
@@ -592,7 +638,10 @@ export default {
             this.project.contactName = res.projectDetails.contactName
             this.project.contactPhone = res.projectDetails.contactPhone
             this.project.type = res.projectDetails.type
-            this.project.platform = res.projectDetails.platform[0]
+            this.project.platform = res.projectDetails.platform
+            this.project.valuationStandard = res.projectDetails.valuationStandard
+            this.project.entrustUnit = res.projectDetails.entrustUnit
+            this.project.field = res.projectDetails.field
             this.project.desc = res.projectDetails.desc
             this.project.doc = []
             this.project.file = []
@@ -626,7 +675,10 @@ export default {
       this.$refs[formName].resetFields()
       this.project.name = ''
       this.project.type = []
-      this.project.platform = []
+      this.project.platform = ''
+      this.project.valuationStandard = ''
+      this.project.entrustUnit = ''
+      this.project.field = ''
       this.project.desc = ''
       this.project.doc = ''
       this.project.file = ''
@@ -821,7 +873,10 @@ export default {
         this.project.contactName = res.projectDetails.contactName
         this.project.contactPhone = res.projectDetails.contactPhone
         this.project.type = res.projectDetails.type
-        this.project.platform = res.projectDetails.platform[0]
+        this.project.platform = res.projectDetails.platform
+        this.project.valuationStandard = res.projectDetails.valuationStandard
+        this.project.entrustUnit = res.projectDetails.entrustUnit
+        this.project.field = res.projectDetails.field
         this.project.desc = res.projectDetails.desc
         this.project.doc = []
         this.project.file = []
@@ -930,6 +985,9 @@ export default {
     setPlatformType () {
       this.platforms = getAllPlatformTypes()
     },
+    setFields(){
+        this.fields = getAllFields()
+    }  ,
     setInstitutions () {
       getAllInstitutions().then((res) => {
         this.institutionArray = res

src/components/project/ProjectCreate.vue

@@ -356,7 +356,7 @@ export default {
             userId: this.user.userVO.id,
             name: this.project.name,
             type: this.project.type,
-            platform: this.project.platform.split('&#'),
+            platform: this.project.applicationType,
             desc: this.project.desc,
             resource: this.project.resource,
             location: newLocation,

src/js/generalService.js

@@ -51,8 +51,12 @@ export const getAllReportTypes = () => {
 
 //获取所有平台类型
 export const getAllPlatformTypes = () => {
-  return ['AndroidAPP', 'IOSAPP', 'Web应用', 'C/S应用软件', '嵌入式软件', '工业控制软件', '信息技术产品', '其他']
-  //return Http.get(Apis.GENERAL.GET_ALL_ABILITIES)
+  return ['Android APP', 'IOS APP', 'Web应用', 'C/S应用软件', '嵌入式软件', '工业控制软件', '信息技术产品', '其他']
+  // return Http.get(Apis.GENERAL.GET_ALL_ApplicationType)
+}
+
+export const getAllFields = () => {
+  return ['科技服务', '互联网服务', '集成电路', '工业控制', '北斗应用', '其他']
 }
 //获取所有定向发布的目标
 export const getAllInstitutions = () => {

src/js/index.js

@@ -57,6 +57,7 @@ import {
   getAllAgencyResourceTypes,
   getAllInstitutions,
   getAllPlatformTypes,
+  getAllFields,
   getAllReportTypes,
   getAllServiceTypes,
   getFormalTimeFromDate,
@@ -203,6 +204,7 @@ export {
   getAllInstitutions,
   //TODO 目前使用本地数据 需要修改 获取所有测试平台类型
   getAllPlatformTypes,
+  getAllFields,
   //TODO 目前使用本地数据 需要修改 获取所有报告类型
   getAllReportTypes,
   //TODO 目前使用本地数据 需要修改 获取所有服务类型(与获取所有测评能力相同)
@@ -690,7 +692,7 @@ export const defaultValue = {
 //     //个人
 //     realName: '李白',
 //     IDCard: '32092111111111',
-//     IDCardPhoto: 'http://www.mooctest.net/assets/img/mooctest.png',
+//     IDCardPositivePhoto: 'http://www.mooctest.net/assets/img/mooctest.png',
 //   }
 //   const enterpriseData = {
 //     type: '企业',//企业、机构、个人

src/js/userService.js

@@ -162,7 +162,7 @@ export const getCurrentAuthenInfo = () => {
     //个人
     realName: '李白',
     IDCard: '32092111111111',
-    IDCardPhoto: 'http://www.mooctest.net/assets/img/mooctest.png',
+    IDCardPositivePhoto: 'http://www.mooctest.net/assets/img/mooctest.png',
   }
   const enterpriseData = {
     type: '企业',//企业、机构、个人