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

src/layout/common/searchInfo.vue

@@ -37,6 +37,12 @@ export default {
 .info .btn {
   text-align: center;
 }
+
+/deep/.el-button {
+  color: #fff;
+  background-color: red;
+  border-color: red;
+}
 /deep/.el-input__inner {
   height: 30px;
   line-height: 30px;

src/layout/companyidentify/detailInfo.vue

@@ -23,6 +23,20 @@
           <el-form-item label="企业类型:">
             <span>{{ ruleForm.type }}</span>
           </el-form-item>
+          <el-form-item label="所属行业:">
+            <el-select v-model="ruleForm.profession_one" placeholder="请选择" @change="changeyi">
+              <el-option v-for="item in yiji" :key="item.value" :label="item.name" :value="item.code"> </el-option>
+            </el-select>
+            <el-select v-model="ruleForm.profession_two" placeholder="请选择" @change="changeer">
+              <el-option v-for="item in erji" :key="item.value" :label="item.name" :value="item.code"> </el-option>
+            </el-select>
+            <el-select v-model="ruleForm.profession_three" placeholder="请选择" @change="changesan">
+              <el-option v-for="item in sanji" :key="item.value" :label="item.name" :value="item.code"> </el-option>
+            </el-select>
+            <el-select v-model="ruleForm.profession_four" placeholder="请选择">
+              <el-option v-for="item in siji" :key="item.value" :label="item.name" :value="item.code"> </el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="统一社会信用代码:">
             <span>{{ ruleForm.code }}</span>
           </el-form-item>
@@ -88,6 +102,10 @@ export default {
   name: 'detailInfo',
   props: {
     ruleForm: null,
+    yiji: null,
+    erji: null,
+    sanji: null,
+    siji: null,
   },
   components: {},
   data: () => ({
@@ -96,6 +114,18 @@ export default {
   created() {},
   computed: {},
   methods: {
+    changeyi(code) {
+      console.log(code);
+      this.$emit('yi', code);
+    },
+    changeer(code) {
+      console.log(code);
+      this.$emit('er', code);
+    },
+    changesan(code) {
+      this.$emit('san', code);
+    },
+
     submitForm(ruleForm) {
       this.$emit('submitForm', { data: this.ruleForm });
     },
@@ -122,4 +152,9 @@ export default {
 .form {
   padding: 0 200px 0 0;
 }
+/deep/.el-button {
+  color: #fff;
+  background-color: red;
+  border-color: red;
+}
 </style>

src/layout/companyup/detailInfo.vue

@@ -20,7 +20,20 @@
           <el-form-item label="实际经营地址:">
             <span>{{ ruleForm.business_addr }}</span>
           </el-form-item>
-          <!-- /* 四级联动行业 */ -->
+          <el-form-item label="所属行业:">
+            <el-select v-model="ruleForm.profession_one" placeholder="请选择" @change="changeyi">
+              <el-option v-for="item in yiji" :key="item.value" :label="item.name" :value="item.code"> </el-option>
+            </el-select>
+            <el-select v-model="ruleForm.profession_two" placeholder="请选择" @change="changeer">
+              <el-option v-for="item in erji" :key="item.value" :label="item.name" :value="item.code"> </el-option>
+            </el-select>
+            <el-select v-model="ruleForm.profession_three" placeholder="请选择" @change="changesan">
+              <el-option v-for="item in sanji" :key="item.value" :label="item.name" :value="item.code"> </el-option>
+            </el-select>
+            <el-select v-model="ruleForm.profession_four" placeholder="请选择">
+              <el-option v-for="item in siji" :key="item.value" :label="item.name" :value="item.code"> </el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="融资联系人:">
             <span>{{ ruleForm.contacts }}</span>
           </el-form-item>
@@ -54,12 +67,29 @@ export default {
   props: {
     ruleForm: null,
     rules: null,
+    yiji: null,
+    erji: null,
+    sanji: null,
+    siji: null,
   },
   components: {},
   data: () => ({}),
   created() {},
   computed: {},
   methods: {
+    changeyi(code) {
+      console.log(code);
+      this.$emit('yi', code);
+    },
+
+    changeer(code) {
+      console.log(code);
+      this.$emit('er', code);
+    },
+    changesan(code) {
+      this.$emit('san', code);
+    },
+
     submitForm(ruleForm) {
       this.$emit('submitForm', { data: this.ruleForm });
     },
@@ -70,4 +100,10 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="less" scoped>
+/deep/.el-button {
+  color: #fff;
+  background-color: red;
+  border-color: red;
+}
+</style>

src/layout/institution/detailInfo.vue

@@ -40,19 +40,8 @@
             <el-input v-model="ruleForm.establish_time" placeholder="请输入创立时间"></el-input>
           </el-form-item>
           <el-form-item label="所属行业">
-            <!-- <el-cascader v-model="ruleForm.profession" :options="optionss" @change="handleChange"></el-cascader> -->
-            <el-select
-              v-for="(arrItem, key) in selectList"
-              :key="key"
-              v-model="selectArr[key]"
-              filterable
-              placeholder="请选择"
-              value-key="value"
-              @change="selected"
-              @focus="position = key"
-              style="margin:10px"
-            >
-              <el-option v-for="item in arrItem" :key="item.value" :label="item.label" :value="item"> </el-option>
+            <el-select v-model="ruleForm.profession" multiple placeholder="请选择">
+              <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> </el-option>
             </el-select>
           </el-form-item>
 
@@ -101,30 +90,6 @@ export default {
   data: () => ({
     position: null,
     selectArr: [],
-    selectList: [
-      [
-        {
-          value: '第1级-选项1',
-          label: '第1级-选项1',
-        },
-        {
-          value: '第1级-选项2',
-          label: '第1级-选项2',
-        },
-        {
-          value: '第1级-选项3',
-          label: '第1级-选项3',
-        },
-        {
-          value: '第1级-选项4',
-          label: '第1级-选项4',
-        },
-        {
-          value: '第1级-选项5',
-          label: '第1级-选项5',
-        },
-      ],
-    ],
 
     rules: {
       name: [{ required: true, message: '请输入活动名称', trigger: 'blur' }],

src/layout/layout-part/menus.vue

@@ -13,6 +13,8 @@
           <el-menu-item index="/supermarket/stock">股权产品</el-menu-item>
         </el-menu-item-group>
       </el-submenu>
+      <el-menu-item index="/finance/index"> <i class="el-icon-s-grid"></i>项目融资超市</el-menu-item>
+
       <el-submenu index="2">
         <template v-slot:title>
           <i class="el-icon-s-grid"></i>
@@ -34,6 +36,16 @@
           <el-menu-item index="/otheruser/index">其他用户</el-menu-item>
         </el-menu-item-group>
       </el-submenu>
+      <el-submenu index="4">
+        <template v-slot:title>
+          <i class="el-icon-s-grid"></i>
+          <span>数字延伸服务管理</span>
+        </template>
+        <el-menu-item-group>
+          <el-menu-item index="/companyuser/index">企业用户</el-menu-item>
+          <el-menu-item index="/otheruser/index">其他用户</el-menu-item>
+        </el-menu-item-group>
+      </el-submenu>
       <el-menu-item index="/companyup/index"> <i class="el-icon-s-grid"></i>企业信息管理</el-menu-item>
       <el-menu-item index="/companyidentify/index"> <i class="el-icon-s-grid"></i>企业认证管理</el-menu-item>
       <el-menu-item index="/character/index"> <i class="el-icon-s-grid"></i>角色管理</el-menu-item>

src/router/index.js

@@ -22,6 +22,12 @@ const routes = [
     path: '/supermarket/debtdetails',
     component: () => import('../views/supermarket/debtdetails.vue'),
   },
+
+  {
+    path: '/finance/index',
+    component: () => import('../views/finance/index.vue'),
+  },
+
   // 金融数字超市 - 股权产品
   {
     path: '/supermarket/stock',

src/store/index.js

@@ -8,6 +8,8 @@ import institution from './institution';
 import character from './character';
 import menurole from './menurole';
 import region from './region';
+import profession from './profession';
+;
 
 Vue.use(Vuex);
 
@@ -21,6 +23,7 @@ export default new Vuex.Store({
     character,
     menurole,
     region,
+    profession,
   },
   state: {},
   mutations: {},

src/store/profession.js

@@ -0,0 +1,38 @@
+import Vue from 'vue';
+import Vuex from 'vuex';
+import _ from 'lodash';
+Vue.use(Vuex);
+const api = {
+  otheruserInfo: `/api/financial/profession`,
+};
+const state = () => ({});
+const mutations = {};
+
+const actions = {
+  async query({ commit }, { skip = 0, limit, ...info } = {}) {
+    const res = await this.$axios.$get(`${api.otheruserInfo}`, { skip, limit, ...info });
+    return res;
+  },
+  async create({ commit }, payload) {
+    const res = await this.$axios.$post(`${api.otheruserInfo}`, payload);
+    return res;
+  },
+  async fetch({ commit }, payload) {
+    const res = await this.$axios.$get(`${api.otheruserInfo}/${payload}`);
+    return res;
+  },
+  async update({ commit }, { id, ...data }) {
+    const res = await this.$axios.$post(`${api.otheruserInfo}/update/${id}`, data);
+    return res;
+  },
+  async delete({ commit }, payload) {
+    const res = await this.$axios.$delete(`${api.otheruserInfo}/${payload}`);
+    return res;
+  },
+};
+export default {
+  namespaced: true,
+  state,
+  mutations,
+  actions,
+};

src/views/companyidentify/detail.vue

@@ -10,7 +10,18 @@
             <detailTop @goBack="goBack"></detailTop>
           </el-col>
           <el-col :span="24" class="info">
-            <detailInfo :ruleForm="ruleForm" @submitForm="submitForm" @resetForm="resetForm"></detailInfo>
+            <detailInfo
+              :ruleForm="ruleForm"
+              @yi="syi"
+              :yiji="yiji"
+              :erji="erji"
+              :sanji="sanji"
+              :siji="siji"
+              @er="ser"
+              @san="ssan"
+              @submitForm="submitForm"
+              @resetForm="resetForm"
+            ></detailInfo>
           </el-col>
         </el-col>
       </el-col>
@@ -24,6 +35,7 @@ import detailTop from '@/layout/common/detailTop.vue';
 import detailInfo from '@/layout/companyidentify/detailInfo.vue';
 import { createNamespacedHelpers } from 'vuex';
 const { mapActions } = createNamespacedHelpers('companyidentify');
+const { mapActions: profession } = createNamespacedHelpers('profession');
 
 export default {
   name: 'detail',
@@ -36,37 +48,15 @@ export default {
   data: () => ({
     display: 'none',
     topTitle: '企业认证信息审核',
-    ruleForm: {
-      // business_license: '营业执照图片',
-      // company_name: '企业名称',
-      // establish_date: '成立日期',
-      // due_date: '营业到期日期',
-      // type: '企业类型',
-      // code: '统一社会信用代码',
-      // registered_capital: '注册资本',
-      // total_assets: '资产总额',
-      // taking: '营业收入',
-      // number: '从业人员数量',
-      // belong_type: '企业所属类型',
-      // profession_one: '所属一级行业',
-      // profession_two: '所属二级行业',
-      // profession_three: '所属三级行业',
-      // profession_four: '所属四级行业',
-      // belong_addr: '企业所属地',
-      // business_addr: '经营地址',
-      // registered_addr: '注册地址',
-      // business_scope: '经营范围',
-      // introduction: '企业简介',
-      // card_front: '身份证正面图',
-      // card_back: '身份证背面图',
-      // representative: '法定代表人',
-      // representative_id: '法人证件号',
-      // representative_phone: '法人手机号',
-      // status: '0',
-    },
+    ruleForm: {},
+    yiji: [],
+    erji: [],
+    sanji: [],
+    siji: [],
   }),
   created() {
     this.search();
+    this.searchquery();
   },
   computed: {
     id() {
@@ -75,6 +65,38 @@ export default {
   },
   methods: {
     ...mapActions(['query', 'delete', 'fetch', 'update']),
+    ...profession({ query: 'query', create: 'create' }),
+    async searchquery() {
+      let pcode = 0;
+      const acc = await this.query({ pcode });
+      console.log(acc.data);
+      this.$set(this, `yiji`, acc.data);
+    },
+
+    async syi(code) {
+      let pcode = code;
+
+      const ess = await this.query({ pcode });
+      console.log(ess.data);
+
+      this.$set(this, `erji`, ess.data);
+    },
+    async ser(code) {
+      let pcode = code;
+
+      const ess = await this.query({ pcode });
+      console.log(ess.data);
+
+      this.$set(this, `sanji`, ess.data);
+    },
+    async ssan(code) {
+      let pcode = code;
+
+      const ess = await this.query({ pcode });
+      console.log(ess.data);
+
+      this.$set(this, `siji`, ess.data);
+    },
     async search() {
       const res = await this.fetch(this.id);
       console.log(res);

src/views/companyup/detail.vue

@@ -10,7 +10,19 @@
             <detailTop @goBack="goBack"></detailTop>
           </el-col>
           <el-col :span="24" class="info">
-            <detailInfo :ruleForm="ruleForm" :rules="rules" @submitForm="submitForm" @resetForm="resetForm"></detailInfo>
+            <detailInfo
+              :ruleForm="ruleForm"
+              :yiji="yiji"
+              :erji="erji"
+              :sanji="sanji"
+              :siji="siji"
+              :rules="rules"
+              @submitForm="submitForm"
+              @resetForm="resetForm"
+              @yi="syi"
+              @er="ser"
+              @san="ssan"
+            ></detailInfo>
           </el-col>
         </el-col>
       </el-col>
@@ -24,6 +36,7 @@ import detailTop from '@/layout/common/detailTop.vue';
 import detailInfo from '@/layout/companyup/detailInfo.vue';
 import { createNamespacedHelpers } from 'vuex';
 const { mapActions } = createNamespacedHelpers('companyup');
+const { mapActions: profession } = createNamespacedHelpers('profession');
 export default {
   name: 'detail',
   props: {},
@@ -37,9 +50,14 @@ export default {
     display: 'none',
     topTitle: '企业信息审核',
     ruleForm: {},
+    yiji: [],
+    erji: [],
+    sanji: [],
+    siji: [],
   }),
   created() {
     this.search();
+    this.searchquery();
   },
   computed: {
     id() {
@@ -48,6 +66,39 @@ export default {
   },
   methods: {
     ...mapActions(['query', 'delete', 'fetch', 'update']),
+    ...profession({ query: 'query', create: 'create' }),
+    async searchquery() {
+      let pcode = 0;
+      const acc = await this.query({ pcode });
+      console.log(acc.data);
+      this.$set(this, `yiji`, acc.data);
+    },
+
+    async syi(code) {
+      let pcode = code;
+
+      const ess = await this.query({ pcode });
+      console.log(ess.data);
+
+      this.$set(this, `erji`, ess.data);
+    },
+    async ser(code) {
+      let pcode = code;
+
+      const ess = await this.query({ pcode });
+      console.log(ess.data);
+
+      this.$set(this, `sanji`, ess.data);
+    },
+    async ssan(code) {
+      let pcode = code;
+
+      const ess = await this.query({ pcode });
+      console.log(ess.data);
+
+      this.$set(this, `siji`, ess.data);
+    },
+
     async search() {
       const res = await this.fetch(this.id);
       console.log(res);

src/views/finance/index.vue

@@ -0,0 +1,19 @@
+<template>
+  <div id="findex">
+    <p>findex</p>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'findex',
+  props: {},
+  components: {},
+  data: () => ({}),
+  created() {},
+  computed: {},
+  methods: {},
+};
+</script>
+
+<style lang="scss" scoped></style>