更新

src/layout/companyidentify/newsInfo.vue

@@ -5,9 +5,6 @@
         <template>
           <el-tabs v-model="activeName" @tab-click="handleClicks">
             <el-tab-pane label="认证中" name="first">
-              <el-col :span="24" class="info">
-                <searchInfo></searchInfo>
-              </el-col>
               <el-table
                 ref="debtTable"
                 :data="debtTable"
@@ -52,9 +49,6 @@
               </el-col>
             </el-tab-pane>
             <el-tab-pane label="认证成功" name="second">
-              <el-col :span="24" class="info">
-                <searchInfo></searchInfo>
-              </el-col>
               <el-table
                 ref="shenheTable"
                 :data="shenheTable"
@@ -98,9 +92,6 @@
               </el-col>
             </el-tab-pane>
             <el-tab-pane label="认证失败" name="third">
-              <el-col :span="24" class="info">
-                <searchInfo></searchInfo>
-              </el-col>
               <el-table
                 ref="noshenhetable"
                 :data="noshenhetable"
@@ -152,7 +143,6 @@
 </template>
 
 <script>
-import searchInfo from '@/layout/common/searchInfo.vue';
 export default {
   name: 'newsInfo',
   props: {
@@ -163,9 +153,7 @@ export default {
     totals: null,
     totalss: null,
   },
-  components: {
-    searchInfo,
-  },
+  components: {},
   data: () => ({
     activeName: 'first',
     input: '',

src/layout/companyup/newsInfo.vue

@@ -5,9 +5,6 @@
         <template>
           <el-tabs v-model="activeName" @tab-click="handleClicks">
             <el-tab-pane label="审核中" name="first">
-              <el-col :span="24" class="info">
-                <searchInfo></searchInfo>
-              </el-col>
               <el-table
                 ref="debtTable"
                 :data="debtTable"
@@ -55,9 +52,6 @@
               </el-col>
             </el-tab-pane>
             <el-tab-pane label="审核通过" name="second">
-              <el-col :span="24" class="info">
-                <searchInfo></searchInfo>
-              </el-col>
               <el-table
                 ref="shenheTable"
                 :data="shenheTable"
@@ -94,15 +88,12 @@
                   :page-size="10"
                   background
                   layout="total, sizes, prev, pager, next, jumper"
-                  total="totals"
+                  :total="totals"
                 >
                 </el-pagination>
               </el-col>
             </el-tab-pane>
             <el-tab-pane label="审核拒绝" name="third">
-              <el-col :span="24" class="info">
-                <searchInfo></searchInfo>
-              </el-col>
               <el-table
                 ref="noshenhetable"
                 :data="noshenhetable"
@@ -153,7 +144,6 @@
 </template>
 
 <script>
-import searchInfo from '@/layout/common/searchInfo.vue';
 export default {
   name: 'newsInfo',
   props: {
@@ -164,9 +154,7 @@ export default {
     totals: null,
     totalss: null,
   },
-  components: {
-    searchInfo,
-  },
+  components: {},
   data: () => ({
     currentPage: 1,
     activeName: 'first',

src/layout/companyuser/userForm.vue

@@ -0,0 +1,164 @@
+<template>
+  <div id="otheruserForm">
+    <el-row>
+      <el-col :span="24" class="top">
+        <span class="shu"></span><span class="title">{{ formTitle }}</span>
+      </el-col>
+      <el-col :span="24" class="form">
+        <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
+          <el-col :span="24">
+            <el-form-item label="企业名称" prop="company_name">
+              <el-input v-model="ruleForm.company_name" placeholder="企业名称"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="手机号" prop="phone">
+              <el-input v-model="ruleForm.phone" placeholder="请输入手机号"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="注册密码" prop="passwd">
+              <el-input v-model="ruleForm.passwd" placeholder="请输入注册密码"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="请输入推荐单位名称" prop="institution_name">
+              <el-input v-model="ruleForm.institution_name" placeholder="请输入推荐单位名称"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="24" class="clickBtn">
+            <el-form-item>
+              <el-button type="primary" size="small" @click="submitForm('ruleForm')">提交</el-button>
+              <el-button size="small" @click="resetForm('ruleForm')">取消</el-button>
+            </el-form-item>
+          </el-col>
+        </el-form>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'otheruserForm',
+  props: {
+    ruleForm: null,
+    charList: null,
+    formTitle: null,
+  },
+  components: {},
+  data: () => ({
+    rules: {
+      // name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
+      // phone: [{ required: true, message: '请输入手机号', trigger: 'blur' }],
+      // type: [{ required: true, message: '请选择用户类型', trigger: 'change' }],
+      // characterid: [{ required: true, message: '请选择用角色', trigger: 'change' }],
+    },
+  }),
+  created() {},
+  computed: {},
+  methods: {
+    submitForm() {
+      this.$emit('submitForm', { data: this.ruleForm });
+    },
+    resetForm() {
+      this.$emit('resetForm');
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+p {
+  padding: 0;
+  margin: 0;
+}
+.top .shu {
+  float: left;
+  width: 4px;
+  height: 20px;
+  background: rgba(233, 2, 29, 1);
+}
+.top .title {
+  float: left;
+  padding: 0 10px;
+  font-size: 16px;
+  font-family: Source Han Sans SC;
+  font-weight: bold;
+  color: rgba(40, 40, 40, 1);
+}
+/deep/.el-textarea__inner {
+  min-height: 100px !important;
+}
+/deep/.select {
+  width: 632px;
+}
+.selects {
+  width: 473px;
+  margin: 0 15px 0 0;
+}
+/deep/.el-radio__input.is-checked + .el-radio__label {
+  color: #e9021d;
+}
+/deep/.el-radio__input.is-checked .el-radio__inner {
+  border-color: #e9021d;
+  background: #e9021d;
+}
+/deep/.el-checkbox__input.is-checked + .el-checkbox__label {
+  color: #e9021d;
+}
+/deep/.el-checkbox__input.is-checked .el-checkbox__inner,
+.el-checkbox__input.is-indeterminate .el-checkbox__inner {
+  background-color: #e9021d;
+  border-color: #e9021d;
+}
+/deep/.el-checkbox-button,
+.el-checkbox-button__inner {
+  margin: 0 15px 0 0;
+}
+/deep/.el-checkbox-button__inner {
+  padding: 7px 5px;
+  border: 1px solid #ccc;
+  border-radius: 5px;
+}
+/deep/.el-checkbox-button__inner:hover {
+  color: #e9021d;
+}
+/deep/.el-checkbox-button:first-child .el-checkbox-button__inner {
+  border-left: 1px solid #ccc;
+  border-radius: 5px;
+}
+/deep/.el-checkbox-button:last-child .el-checkbox-button__inner {
+  border-radius: 5px;
+}
+/deep/.el-checkbox-button.is-checked .el-checkbox-button__inner {
+  color: #e9021d;
+  background-color: #ffffff;
+  border-color: #e9021d;
+}
+/deep/.el-checkbox-button.is-checked .el-checkbox-button__inner {
+  box-shadow: none;
+}
+/deep/.el-switch.is-checked .el-switch__core {
+  border-color: #e9021d;
+  background-color: #e9021d;
+}
+.clickBtn .el-button {
+  width: 100px;
+  height: 40px;
+  padding: 0;
+  color: #ffffff;
+  background: #b9b9b9;
+  border-radius: 4px;
+  margin: 40px;
+}
+.clickBtn {
+  text-align: center;
+  margin: 40px 0;
+  border-top: 1px solid #ccc;
+}
+.clickBtn .el-button:first-child {
+  background-color: #e9021d;
+}
+</style>

src/layout/institution/detailInfo.vue

@@ -36,7 +36,7 @@
             </el-form-item>
             <el-col :span="24" class="form">
               <el-form-item label="融资轮次">
-                <el-select v-model="ruleForm.round" multiple placeholder="请选择">
+                <el-select v-model="ruleForm.round" 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>
@@ -104,7 +104,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">
@@ -141,15 +140,25 @@ export default {
   },
   data: () => ({
     rules: {
-      name1: [{ required: true, message: '请输入名称', trigger: 'blur' }],
-      name2: [{ required: true, message: '请输入名称', trigger: 'blur' }],
-      textarea: [{ required: true, message: '请输入文本框', trigger: 'blur' }],
-      change: [{ required: true, message: '请选择', trigger: 'blur' }],
-      radio: [{ required: true, message: '请选择', trigger: 'blur' }],
-      checkbox: [{ required: true, message: '请选择', trigger: 'blur' }],
-      term: [{ required: true, message: '请选择', trigger: 'blur' }],
-      onDown: [{ required: true, message: '请选择', trigger: 'blur' }],
-      file: [{ required: true, message: '请选择', trigger: 'blur' }],
+      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' }],
+      size: [{ 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' }],
     },
 
     props: { multiple: true },

src/layout/institution/newsInfo.vue

@@ -31,7 +31,7 @@
                 <!-- <el-button @click="handleClick(scope.row)" type="text"><i class="el-icon-edit"></i></el-button>
                 <el-button @click.native.prevent="deleteRow(scope.$index, debtTable)" type="text"><i class="el-icon-delete"></i></el-button> -->
                 <el-button size="mini" type="text" class="edit" icon="el-icon-edit" @click="handleClick(scope.row)"></el-button>
-                <el-button size="mini" type="text" class="delete" icon="el-icon-delete" @click.native.prevent="deleteRow(scope.$index, debtTable)"></el-button>
+                <el-button size="mini" type="text" class="delete" icon="el-icon-delete" @click.prevent="deleteRow(scope.row.id)"></el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -60,6 +60,8 @@ export default {
   props: {
     debtTable: null,
     total: null,
+    totals: null,
+    totalss: null,
   },
   components: {},
   data: () => ({
@@ -77,6 +79,9 @@ export default {
     handleCurrentChange(val) {
       console.log(`当前页: ${val}`);
     },
+    deleteRow(id) {
+      this.$emit('deleteRow', id);
+    },
     handleClick(id) {
       console.log(id.id);
       let newid = id.id;

src/layout/otheruser/otheruserForm.vue

@@ -55,8 +55,10 @@ export default {
   components: {},
   data: () => ({
     rules: {
+      name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
       phone: [{ required: true, message: '请输入手机号', trigger: 'blur' }],
       type: [{ required: true, message: '请选择用户类型', trigger: 'change' }],
+      characterid: [{ required: true, message: '请选择用角色', trigger: 'change' }],
     },
   }),
   created() {},

src/layout/region/regionForm.vue

@@ -40,6 +40,7 @@ export default {
   data: () => ({
     rules: {
       name: [{ required: true, message: '请输入地区名称', trigger: 'blur' }],
+      url: [{ required: true, message: '请输入路径', trigger: 'blur' }],
     },
   }),
   created() {},

src/router/index.js

@@ -65,6 +65,12 @@ const routes = [
     path: '/companyuser/index',
     component: () => import('../views/companyuser/index.vue'),
   },
+
+  {
+    path: '/companyuser/detail',
+    component: () => import('../views/companyuser/detail.vue'),
+  },
+
   //指导单位
   {
     path: '/zhidao/index',

src/views/companyidentify/detail.vue

@@ -108,6 +108,7 @@ export default {
       this.ruleForm.status = 1;
       console.log(this.ruleForm);
       let res = this.update(this.ruleForm);
+      this.$checkRes(res, '发布成功', '发布失败');
     },
     // 取消
     resetForm(ruleForm) {

src/views/companyidentify/index.vue

@@ -79,7 +79,7 @@ export default {
 .main {
   height: 765px;
   background: #ffffff;
-  padding: 0 20px 0 20px;
+  padding: 0 30px 0 30px;
 }
 .search {
   width: 97%;

src/views/companyup/detail.vue

@@ -110,6 +110,7 @@ export default {
       this.ruleForm.status = 1;
       console.log(this.ruleForm);
       let res = this.update(this.ruleForm);
+      this.$checkRes(res, '审核成功', '审核成功');
     },
     // 取消
     resetForm(ruleForm) {

src/views/companyup/index.vue

@@ -86,7 +86,7 @@ export default {
 .main {
   height: 765px;
   background: #ffffff;
-  padding: 0 20px 0 20px;
+  padding: 0 30px 0 30px;
 }
 .search {
   width: 97%;

src/views/companyuser/detail.vue

@@ -0,0 +1,108 @@
+<template>
+  <div id="detail">
+    <el-row>
+      <el-col :span="24" class="debt">
+        <el-col :span="24" class="top">
+          <!-- <topInfo :topTitle="topTitle" :display="display"></topInfo> -->
+          <detailTopInfo :topTitle="topTitle" :display="display"></detailTopInfo>
+        </el-col>
+        <el-col :span="24" class="main">
+          <userForm :ruleForm="ruleForm" :formTitle="formTitle" :charList="charList" @submitForm="submitForm" @resetForm="resetForm"></userForm>
+        </el-col>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import topInfo from '@/layout/common/topInfo.vue';
+import detailTopInfo from '@/layout/common/detailTopInfo.vue';
+import userForm from '@/layout/companyuser/userForm.vue';
+import { createNamespacedHelpers, mapGetters } from 'vuex';
+const { mapActions: otheruser } = createNamespacedHelpers('companyuser');
+const { mapActions: character } = createNamespacedHelpers('character');
+export default {
+  name: 'detail',
+  props: {},
+  components: {
+    detailTopInfo, //头部导航
+    userForm, //头部返回
+  },
+  data: () => ({
+    topTitle: '用户信息管理',
+    display: 'block',
+
+    formTitle: '其他用户管理',
+    ruleForm: {
+      passwd: '123456',
+      characterid: '',
+    },
+    charList: {
+      name: '10',
+    },
+  }),
+  created() {
+    this.searchInfo();
+  },
+  computed: {
+    id() {
+      return this.$route.query.id;
+    },
+  },
+  methods: {
+    ...otheruser(['query', 'fetch', 'update', 'create']),
+    ...character({ charquery: 'query', charFetch: 'fetch' }),
+    async searchInfo() {
+      if (this.id) {
+        const res = await this.fetch(this.id);
+        this.$set(this, `ruleForm`, res.data);
+      }
+    },
+
+    // 提交
+    async submitForm({ data }) {
+      let res;
+      if (this.id) {
+        res = await this.update(data);
+        if (res.errcode === 0) {
+          this.$message({
+            message: '信息修改成功',
+            type: 'success',
+          });
+        }
+      } else {
+        res = await this.create(data);
+        if (res.errcode === 0) {
+          this.$message({
+            message: '信息创建成功',
+            type: 'success',
+          });
+        }
+      }
+      if (this.$checkRes(res)) this.resetForm();
+
+      console.log(res.data);
+    },
+    // 取消
+    resetForm() {
+      this.$router.push({ path: '/companyuser/index' });
+    },
+    // 返回
+    goBack() {
+      this.$router.go(-1);
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.top {
+  height: 50px;
+  margin: 0 0 10px 0;
+}
+.main {
+  min-height: 765px;
+  background: #ffffff;
+  padding: 20px;
+}
+</style>

src/views/companyuser/index.vue

@@ -37,16 +37,16 @@ export default {
     topTitle: '企业用户',
     display: 'block',
     debtTable: [
-      {
-        company_name: '测试企业1',
-        institution_name: '推荐单位1',
-        phone: '123456789',
-      },
-      {
-        company_name: '测试企业2',
-        institution_name: '推荐单位2',
-        phone: '123456789',
-      },
+      // {
+      //   company_name: '测试企业1',
+      //   institution_name: '推荐单位1',
+      //   phone: '123456789',
+      // },
+      // {
+      //   company_name: '测试企业2',
+      //   institution_name: '推荐单位2',
+      //   phone: '123456789',
+      // },
     ],
   }),
   created() {
@@ -65,7 +65,9 @@ export default {
     deleteRow(id) {
       console.log(id);
     },
-    add() {},
+    add() {
+      this.$router.push({ path: '/companyuser/detail' });
+    },
   },
 };
 </script>

src/views/institution/detail.vue

@@ -51,6 +51,7 @@ export default {
     submitForm(ruleForm) {
       console.log(ruleForm);
       let res = this.update(this.ruleForm);
+      this.$checkRes(res, '修改成功', '修改失败');
       this.$router.push({ path: '/institution/index' });
     },
     // 取消

src/views/institution/index.vue

@@ -9,7 +9,7 @@
           <searchInfo></searchInfo>
         </el-col>
         <el-col :span="24" class="list">
-          <newsInfo :debtTable="debtTable" :total="totals" :totals="totals" :totalss="totalss" @handleClick="handleClick"></newsInfo>
+          <newsInfo :debtTable="debtTable" @deleteRow="deleteRow" :total="total" :totals="totals" :totalss="totalss" @handleClick="handleClick"></newsInfo>
         </el-col>
       </el-col>
     </el-row>
@@ -101,19 +101,25 @@ export default {
 
       var weishenhe = res.data.filter(item => item.type === '0');
       console.log(weishenhe);
-
+      console.log(weishenhe.length);
       this.$set(this, `debtTable`, weishenhe);
       this.$set(this, `total`, weishenhe.length);
     },
+
+    async deleteRow(id) {
+      const res = await this.delete(id);
+      this.$checkRes(res, '删除成功', '删除失败');
+      this.search();
+    },
     async searchstatus1({ skip = 0, limit = 10, ...info } = {}) {
       console.log(status);
 
       const res = await this.query({ skip, limit, ...info });
 
       var weishenhe = res.data.filter(item => item.type === '1');
-
+      console.log(weishenhe.length);
       this.$set(this, `debtTable`, weishenhe);
-      this.$set(this, `totals`, weishenhe.length);
+      this.$set(this, `total`, weishenhe.length);
     },
     async searchelse({ skip = 0, limit = 10, ...info } = {}) {
       console.log(status);
@@ -124,7 +130,9 @@ export default {
       console.log(weishenhe);
 
       this.$set(this, `debtTable`, weishenhe);
-      this.$set(this, `totalss`, weishenhe.length);
+      console.log(weishenhe.length);
+
+      this.$set(this, `total`, weishenhe.length);
     },
     handleClick(newid) {
       this.$router.push({ path: '/institution/detail', query: { id: newid } });