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

src/layout/institution/detailInfo.vue

@@ -12,6 +12,15 @@
                 <el-input v-model="ruleForm.name" placeholder="请输入金融机构名称"></el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="24">
+              <el-form-item label="机构类型" prop="type">
+                <el-select v-model="ruleForm.type" placeholder="请选择机构类型">
+                  <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-col>
             <el-col :span="24">
               <el-form-item label="机构logo" prop="logo">
                 <upload
@@ -26,11 +35,18 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="融资轮次" prop="round">
-                <el-select v-model="ruleForm.round" multiple placeholder="请选择融资轮次">
+                <el-select style="width:100%" v-model="ruleForm.round" multiple placeholder="请选择融资轮次" @change="changeRound">
                   <el-option v-for="item in rzlc" :key="item.value" :label="item.name" :value="item.name"> </el-option>
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="24">
+              <el-form-item label="行业" prop="profession">
+                <el-select style="width:100%" v-model="ruleForm.profession" multiple placeholder="请选择" @change="changeProfession">
+                  <el-option v-for="item in sshy" :key="item.value" :label="item.name" :value="item.name"> </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
             <el-col :span="24">
               <el-form-item label="组织形式" prop="form">
                 <el-input v-model="ruleForm.form" placeholder="请输入组织形式"></el-input>
@@ -57,13 +73,6 @@
                 <el-input v-model="ruleForm.establish_time" placeholder="请输入创立时间"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
-              <el-form-item label="所属行业" prop="profession">
-                <el-select v-model="ruleForm.profession" multiple placeholder="请选择">
-                  <el-option v-for="item in options" :key="item.value" :label="item.name" :value="item.name"> </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
             <el-col :span="24">
               <el-form-item label="组织机构号码" prop="code">
                 <el-input v-model="ruleForm.code" placeholder="请输入组织机构号码"></el-input>
@@ -96,26 +105,6 @@
                 <el-input v-model="ruleForm.introduction" type="textarea" placeholder="请输入机构简介"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="24"> </el-col>
-            <el-col :span="24">
-              <el-form-item label="机构类型" prop="type">
-                <el-select v-model="ruleForm.type" placeholder="请选择机构类型">
-                  <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-col>
-            <el-col :span="24">
-              <el-form-item label="发布状态" prop="status">
-                <el-select v-model="ruleForm.status" placeholder="请选择发布状态">
-                  <el-option label="草稿" value="0"></el-option>
-                  <el-option label="待审核" value="1"></el-option>
-                  <el-option label="已发布" value="2"></el-option>
-                  <el-option label="已下架" value="3"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
             <el-col :span="24" class="clickBtn">
               <el-form-item>
                 <el-button type="primary" @click="submitForm('ruleForm')">提交</el-button>
@@ -136,7 +125,7 @@ export default {
   props: {
     formTitle: null,
     ruleForm: null,
-    options: null,
+    sshy: null,
     rzlc: null,
   },
   components: {
@@ -146,22 +135,23 @@ export default {
     rules: {
       name: [{ required: true, message: '请输入机构名称', trigger: 'blur' }],
       type: [{ required: true, message: '请选择机构类型', trigger: 'blur' }],
-      profession: [{ required: true, message: '请选择所属行业', trigger: 'blur' }],
-      form: [{ required: true, message: '请输人组织形式', trigger: 'blur' }],
-      round: [{ required: true, message: '请选择融资轮次', trigger: 'blur' }],
-      representative: [{ required: true, message: '请输人法定代表人', trigger: 'blur' }],
-      business_addr: [{ required: true, message: '请输人办公地址', trigger: 'blur' }],
-      belong_addr: [{ required: true, message: '请输人所属地区', trigger: 'blur' }],
-      registered_addr: [{ required: true, message: '请输人注册地址', trigger: 'blur' }],
-      establish_time: [{ required: true, message: '请输人创立时间', trigger: 'blur' }],
-      establish_time: [{ required: true, message: '请输人创立时间', trigger: 'blur' }],
-      size: [{ required: true, message: '请输入管理资金规模', trigger: 'blur' }],
-      registered_capital: [{ required: true, message: '请输入注册资本', trigger: 'blur' }],
-      introduction: [{ required: true, message: '请输入机构简介', trigger: 'blur' }],
-      registered_capital: [{ required: true, message: '请输入注册资本', trigger: 'blur' }],
-      contributed_capital: [{ required: true, message: '请输入实缴资金', trigger: 'blur' }],
-      status: [{ required: true, message: '请选择发布状态', trigger: 'blur' }],
-      belong_addr: [{ required: true, message: '请输入所属地区', trigger: 'blur' }],
+      logo: [{ required: true, message: '请上传机构logo', trigger: 'blur' }],
+      // profession: [{ required: true, message: '请选择所属行业', trigger: 'blur' }],
+      // form: [{ required: true, message: '请输人组织形式', trigger: 'blur' }],
+      // round: [{ required: true, message: '请选择融资轮次', trigger: 'blur' }],
+      // representative: [{ required: true, message: '请输人法定代表人', trigger: 'blur' }],
+      // business_addr: [{ required: true, message: '请输人办公地址', trigger: 'blur' }],
+      // belong_addr: [{ required: true, message: '请输人所属地区', trigger: 'blur' }],
+      // registered_addr: [{ required: true, message: '请输人注册地址', trigger: 'blur' }],
+      // establish_time: [{ required: true, message: '请输人创立时间', trigger: 'blur' }],
+      // establish_time: [{ required: true, message: '请输人创立时间', trigger: 'blur' }],
+      // size: [{ required: true, message: '请输入管理资金规模', trigger: 'blur' }],
+      // registered_capital: [{ required: true, message: '请输入注册资本', trigger: 'blur' }],
+      // introduction: [{ required: true, message: '请输入机构简介', trigger: 'blur' }],
+      // registered_capital: [{ required: true, message: '请输入注册资本', trigger: 'blur' }],
+      // contributed_capital: [{ required: true, message: '请输入实缴资金', trigger: 'blur' }],
+      // status: [{ required: true, message: '请选择发布状态', trigger: 'blur' }],
+      // belong_addr: [{ required: true, message: '请输入所属地区', trigger: 'blur' }],
     },
 
     props: { multiple: true },
@@ -199,6 +189,26 @@ export default {
       }
     },
     clickDown() {},
+    changeRound(round) {
+      const data = round[round.length - 1];
+      if (data === '不限') {
+        round = ['不限'];
+        this.$set(this.ruleForm, `round`, round);
+      } else {
+        round = round.filter(item => item !== '不限');
+        this.$set(this.ruleForm, `round`, round);
+      }
+    },
+    changeProfession(profession) {
+      const data = profession[profession.length - 1];
+      if (data === '不限') {
+        profession = ['不限'];
+        this.$set(this.ruleForm, `profession`, profession);
+      } else {
+        profession = profession.filter(item => item !== '不限');
+        this.$set(this.ruleForm, `profession`, profession);
+      }
+    },
   },
 };
 </script>

src/views/institution/detail.vue

@@ -6,7 +6,7 @@
           <detailTopInfo :topTitle="topTitle" :display="display"></detailTopInfo>
         </el-col>
         <el-col :span="24" class="main">
-          <detailInfo :ruleForm="ruleForm" :rzlc="rzlc" :options="options" @submitForm="submitForm" @resetForm="resetForm" :formTitle="formTitle"></detailInfo>
+          <detailInfo :ruleForm="ruleForm" :rzlc="rzlc" :sshy="sshy" @submitForm="submitForm" @resetForm="resetForm" :formTitle="formTitle"></detailInfo>
         </el-col>
       </el-col>
     </el-row>
@@ -32,7 +32,7 @@ export default {
     display: 'block',
     formTitle: '信息管理',
     ruleForm: {},
-    options: [],
+    sshy: [],
     rzlc: [],
   }),
   created() {
@@ -54,12 +54,12 @@ export default {
     },
 
     async searchinfo() {
-      const val = await this.list();
-      console.log(val.data);
+      const sshy = await this.list({ type: 'sshy' });
+      const rzlc = await this.list({ type: 'rzlc' });
       // var options = res.data.filter(item => item.type === '0');
       // var rzlc = res.data.filter(item => item.type === '1');
-      this.$set(this, `options`, val.data);
-      this.$set(this, `rzlc`, val.data);
+      this.$set(this, `sshy`, sshy.data);
+      this.$set(this, `rzlc`, rzlc.data);
     },
     // 提交
     submitForm(ruleForm) {