Merge branch 'master' of http://git.cc-lotus.info/financial_platform/admin-cms

src/layout/institution/detailInfo.vue

@@ -11,14 +11,14 @@
           </el-form-item>
           <el-form-item label="机构类型" prop="type">
             <el-select v-model="ruleForm.type" placeholder="请选择机构类型">
-              <el-option label="能发布债权产品" value="shanghai"></el-option>
-              <el-option label="能发布股权产品" value="shanghai"></el-option>
-              <el-option label="既能发布债权产品又能发布股权产品" value="shanghai"></el-option>
+              <el-option label="能发布债权产品" value="0"></el-option>
+              <el-option label="能发布股权产品" value="1"></el-option>
+              <el-option label="既能发布债权产品又能发布股权产品" value="2"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="融资轮次">
+          <!-- <el-form-item label="融资轮次">
             <el-input v-model="ruleForm.round" placeholder="请输入融资轮次"></el-input>
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item label="组织形式">
             <el-input v-model="ruleForm.form" placeholder="请输入组织形式"></el-input>
           </el-form-item>
@@ -36,34 +36,27 @@
           <el-form-item label="创立时间">
             <el-input v-model="ruleForm.establish_time" placeholder="请输入创立时间"></el-input>
           </el-form-item>
-
-          <el-form-item label="所属行业">
+          <!-- <el-form-item label="所属行业">
             <el-select v-model="ruleForm.profession" placeholder="请选择所属行业">
-              <el-option label="行业1" value="shanghai"></el-option>
-              <el-option label="行业2" value="shanghai"></el-option>
+              <el-option label="行业1" value="0"></el-option>
+              <el-option label="行业2" value="1"></el-option>
             </el-select>
-          </el-form-item>
-
+          </el-form-item> -->
           <el-form-item label="组织机构号码">
             <el-input v-model="ruleForm.code" placeholder="请输入组织机构号码"></el-input>
           </el-form-item>
-
           <el-form-item label="管理资金规模">
             <el-input v-model="ruleForm.size" placeholder="请输入管理资金规模"></el-input>
           </el-form-item>
-
           <el-form-item label="注册资本">
             <el-input v-model="ruleForm.registered_capital" placeholder="请输入注册资本"></el-input>
           </el-form-item>
-
           <el-form-item label="注册资本">
             <el-input v-model="ruleForm.registered_capital" placeholder="请输入注册资本"></el-input>
           </el-form-item>
-
           <el-form-item label="实缴资金">
             <el-input v-model="ruleForm.contributed_capital" placeholder="请输入	实缴资金"></el-input>
           </el-form-item>
-
           <el-form-item label="机构简介">
             <wang-editor v-model="ruleForm.introduction" placeholder="请输入机构简介"></wang-editor>
           </el-form-item>

src/views/institution/detail.vue

@@ -50,7 +50,6 @@ export default {
     async search() {
       const res = await this.fetch(this.id);
       console.log(res.data);
-
       this.$set(this, `ruleForm`, res.data);
     },
     // 提交