YY 3 jaren geleden
bovenliggende
commit
f2b13e14d5

+ 10 - 0
src/router/index.js

@@ -70,6 +70,11 @@ const admin = [
     meta: { title: '通知管理' },
     component: () => import('../views/adminCenter/adminMessage/notice/index.vue'),
   },
+  {
+    path: '/adminCenter/adminMessage/notice/detail',
+    meta: { title: '通知管理-编辑通知' },
+    component: () => import('../views/adminCenter/adminMessage/notice/detail.vue'),
+  },
   {
     path: '/adminCenter/adminMessage/question/index',
     meta: { title: '问题管理' },
@@ -95,6 +100,11 @@ const admin = [
     meta: { title: '国知局反馈信息' },
     component: () => import('../views/adminCenter/adminExamine/bureau/index.vue'),
   },
+  {
+    path: '/adminCenter/adminExamine/bureau/detail',
+    meta: { title: '国知局反馈信息-分发消息' },
+    component: () => import('../views/adminCenter/adminExamine/bureau/detail.vue'),
+  },
   {
     path: '/adminCenter/adminExamine/search/index',
     meta: { title: '查新检索' },

+ 32 - 21
src/views/adminCenter/adminAgent/detail.vue

@@ -4,30 +4,41 @@
       <el-col :span="24" class="main">
         <el-col class="one">
           <el-button type="primary" size="mini" @click="toReturn()">返回</el-button>
-          <span class="sp">代理机构-信息管理</span>
         </el-col>
         <el-col class="two">
           <el-form :model="form" :rules="rules" ref="form" label-width="140px">
-            <el-form-item label="管理员" prop="name1">
-              <el-select v-model="form.name1" clearable filterable placeholder="请选择" style="width: 100%" size="small">
-                <el-option v-for="item in name1List" :key="item.value" :label="item.label" :value="item.value"> </el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="机构代码或邀请码" prop="title">
-              <el-input v-model="form.title" placeholder="请输入" size="small"></el-input>
-            </el-form-item>
-            <el-form-item label="机构名称" prop="title">
-              <el-input v-model="form.title" placeholder="请输入" size="small"></el-input>
-            </el-form-item>
-            <el-form-item label="姓名" prop="title">
-              <el-input v-model="form.title" placeholder="请输入" size="small"></el-input>
-            </el-form-item>
-            <el-form-item label="手机号" prop="title">
-              <el-input v-model="form.title" placeholder="请输入" size="small"></el-input>
-            </el-form-item>
-            <el-form-item label="密码" prop="title">
-              <el-input v-model="form.title" placeholder="请输入" size="small"></el-input>
-            </el-form-item>
+            <el-col :span="12">
+              <el-form-item label="管理员" prop="name1">
+                <el-select v-model="form.name1" clearable filterable placeholder="请选择" style="width: 100%" size="small">
+                  <el-option v-for="item in name1List" :key="item.value" :label="item.label" :value="item.value"> </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="机构代码或邀请码" prop="title">
+                <el-input v-model="form.title" placeholder="请输入" size="small"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="机构名称" prop="title">
+                <el-input v-model="form.title" placeholder="请输入" size="small"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="姓名" prop="title">
+                <el-input v-model="form.title" placeholder="请输入" size="small"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="手机号" prop="title">
+                <el-input v-model="form.title" placeholder="请输入" size="small"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="密码" prop="title">
+                <el-input v-model="form.title" placeholder="请输入" size="small"></el-input>
+              </el-form-item>
+            </el-col>
             <el-form-item>
               <el-button class="btn" type="primary" size="mini" @click="onSubmit('form')">提交</el-button>
             </el-form-item>

+ 3 - 16
src/views/adminCenter/adminAgent/index.vue

@@ -2,14 +2,10 @@
   <div id="index">
     <el-row>
       <el-col :span="24" class="main animate__animated animate__backInRight">
-        <el-col class="one">
-          <span>代理机构</span>
-        </el-col>
-        <el-col class="two"> </el-col>
-        <el-col :span="24" class="thr">
+        <el-col :span="24" class="one">
           <data-table :fields="fields" :opera="opera" :data="list" @query="search" :total="total" @edit="toEdit" @del="toDel">
             <template slot="selfbtn">
-              <el-button type="primary" size="mini" @click="toAdd()">添加用户</el-button>
+              <el-button type="primary" size="mini" @click="toAdd()">新增</el-button>
             </template>
           </data-table>
         </el-col>
@@ -73,13 +69,4 @@ export default {
 };
 </script>
 
-<style lang="less" scoped>
-.main {
-  .one {
-    padding: 20px 0 20px 0px;
-    font-size: 26px;
-    font-weight: 700;
-    margin-right: 10px;
-  }
-}
-</style>
+<style lang="less" scoped></style>

+ 35 - 3
src/views/adminCenter/adminExamine/apply/index.vue

@@ -1,7 +1,11 @@
 <template>
   <div id="index">
     <el-row>
-      <el-col :span="24" class="main animate__animated animate__backInRight"> test </el-col>
+      <el-col :span="24" class="main animate__animated animate__backInRight">
+        <el-col :span="24" class="one">
+          <data-table :fields="fields" :opera="opera" :data="list" @query="search" :total="total" @del="toDel"> </data-table>
+        </el-col>
+      </el-col>
     </el-row>
   </div>
 </template>
@@ -13,10 +17,38 @@ export default {
   props: {},
   components: {},
   data: function () {
-    return {};
+    return {
+      //列头配置项
+      fields: [
+        { label: '名称', prop: 'name' },
+        { label: '申请类型', prop: 'name' },
+        { label: '申请状态', prop: 'name' },
+      ],
+      // 操作
+      opera: [
+        { label: '详细信息', method: 'detailed', confirm: true, type: 'danger' },
+        { label: '申请文件', method: 'apply', confirm: true, type: 'danger' },
+        { label: '受理', method: 'acceptance', confirm: true, type: 'danger' },
+      ],
+      list: [],
+      total: 0,
+    };
   },
   created() {},
-  methods: {},
+  methods: {
+    // 详细信息
+    toetailed({ data }) {
+      console.log(data);
+    },
+    // 申请文件
+    toApply({ data }) {
+      console.log(data);
+    },
+    // 受理
+    toAacceptance({ data }) {
+      console.log(data);
+    },
+  },
   computed: {
     ...mapState(['user']),
   },

+ 111 - 0
src/views/adminCenter/adminExamine/bureau/detail.vue

@@ -0,0 +1,111 @@
+<template>
+  <div id="detail">
+    <el-row>
+      <el-col :span="24" class="main">
+        <el-col class="one">
+          <el-col :span="2" class="one_1"> <span>文件</span></el-col>
+          <!-- <el-form :model="form" :rules="rules" ref="form" label-width="100px">
+            <el-form-item label="附件" prop="file">
+              <s-upload :limit="2" :data="form.file" type="file" :url="uri" @upload="uplSuc" @delete="uplDel"></s-upload>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" size="mini" @click="onSubmit('form')">确定</el-button>
+              <el-button type="danger" size="mini" @click="toReset('form')">取消</el-button>
+            </el-form-item>
+          </el-form> -->
+          <el-col :span="20">
+            <el-upload action="#" list-type="picture-card" :auto-upload="false">
+              <i slot="default" class="el-icon-plus"></i>
+              <div slot="file" slot-scope="{ file }">
+                <img class="el-upload-list__item-thumbnail" :src="file.url" alt="" />
+                <span class="el-upload-list__item-actions">
+                  <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
+                    <i class="el-icon-zoom-in"></i>
+                  </span>
+                  <span v-if="!disabled" class="el-upload-list__item-delete" @click="handleDownload(file)">
+                    <i class="el-icon-download"></i>
+                  </span>
+                  <span v-if="!disabled" class="el-upload-list__item-delete" @click="handleRemove(file)">
+                    <i class="el-icon-delete"></i>
+                  </span>
+                </span>
+              </div>
+            </el-upload>
+            <el-dialog :visible.sync="dialogVisible">
+              <img width="100%" :src="dialogImageUrl" alt="" />
+            </el-dialog>
+          </el-col>
+        </el-col>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { mapState, createNamespacedHelpers } from 'vuex';
+export default {
+  name: 'detail',
+  props: {},
+  components: {},
+  data: function () {
+    return {
+      rules: {},
+      // uri: '/files/label/upload',
+      dialogImageUrl: '',
+      dialogVisible: false,
+      disabled: false,
+    };
+  },
+  created() {},
+  methods: {
+    onSubmit(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          this.$emit('onSubmit', { data: this.form });
+        } else {
+          console.log('error submit!!');
+          return false;
+        }
+      });
+    },
+    //返回
+    toReturn() {
+      this.$router.push({ path: '/adminCenter/adminUser/index' });
+    },
+    // 上传图片
+    // uplSuc({ type, data }) {
+    //   this.form[type].push({ name: data.name, url: data.uri });
+    // },
+    // uplDel(data) {
+    //   let index = this.form.file.findIndex((i) => i.url == data.file.url);
+    //   this.form.file.splice(index, 1);
+    // },
+
+    handleRemove(file) {
+      console.log(file);
+    },
+    handlePictureCardPreview(file) {
+      this.dialogImageUrl = file.url;
+      this.dialogVisible = true;
+    },
+    handleDownload(file) {
+      console.log(file);
+    },
+  },
+  computed: {
+    ...mapState(['user']),
+  },
+  metaInfo() {
+    return { title: this.$route.meta.title };
+  },
+  watch: {
+    test: {
+      deep: true,
+      immediate: true,
+      handler(val) {},
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped></style>

+ 34 - 4
src/views/adminCenter/adminExamine/bureau/index.vue

@@ -1,7 +1,14 @@
 <template>
   <div id="index">
     <el-row>
-      <el-col :span="24" class="main animate__animated animate__backInRight"> test </el-col>
+      <el-col :span="24" class="main animate__animated animate__backInRight">
+        <el-col :span="24" class="one">
+          <el-button type="primary" size="mini" @click="toDistribute()">自动分发</el-button>
+        </el-col>
+        <el-col :span="24" class="two">
+          <data-table :fields="fields" :opera="opera" :data="list" @query="search" :total="total" @del="toDel"> </data-table>
+        </el-col>
+      </el-col>
     </el-row>
   </div>
 </template>
@@ -13,10 +20,26 @@ export default {
   props: {},
   components: {},
   data: function () {
-    return {};
+    return {
+      //列头配置项
+      fields: [
+        { label: '名称', prop: 'name' },
+        { label: '发送时间', prop: 'name' },
+        { label: '是否已读', prop: 'name' },
+      ],
+      // 操作
+      opera: [{ label: '查看文件', method: 'see', confirm: true, type: 'danger' }],
+      list: [],
+      total: 0,
+    };
   },
   created() {},
-  methods: {},
+  methods: {
+    // 查看文件
+    toSee({ data }) {
+      console.log(data);
+    },
+  },
   computed: {
     ...mapState(['user']),
   },
@@ -33,4 +56,11 @@ export default {
 };
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+.main {
+  .one {
+    text-align: center;
+    padding: 10px 0;
+  }
+}
+</style>

+ 33 - 21
src/views/adminCenter/adminMech/detail.vue

@@ -4,30 +4,42 @@
       <el-col :span="24" class="main">
         <el-col class="one">
           <el-button type="primary" size="mini" @click="toReturn()">返回</el-button>
-          <span class="sp">机构用户-信息管理</span>
         </el-col>
         <el-col class="two">
           <el-form :model="form" :rules="rules" ref="form" label-width="140px">
-            <el-form-item label="管理员" prop="name1">
-              <el-select v-model="form.name1" clearable filterable placeholder="请选择" style="width: 100%" size="small">
-                <el-option v-for="item in name1List" :key="item.value" :label="item.label" :value="item.value"> </el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="机构代码或邀请码" prop="title">
-              <el-input v-model="form.title" placeholder="请输入" size="small"></el-input>
-            </el-form-item>
-            <el-form-item label="机构名称" prop="title">
-              <el-input v-model="form.title" placeholder="请输入" size="small"></el-input>
-            </el-form-item>
-            <el-form-item label="姓名" prop="title">
-              <el-input v-model="form.title" placeholder="请输入" size="small"></el-input>
-            </el-form-item>
-            <el-form-item label="手机号" prop="title">
-              <el-input v-model="form.title" placeholder="请输入" size="small"></el-input>
-            </el-form-item>
-            <el-form-item label="密码" prop="title">
-              <el-input v-model="form.title" placeholder="请输入" size="small"></el-input>
-            </el-form-item>
+            <el-col :span="12">
+              <el-form-item label="管理员" prop="name1">
+                <el-select v-model="form.name1" clearable filterable placeholder="请选择" style="width: 100%" size="small">
+                  <el-option v-for="item in name1List" :key="item.value" :label="item.label" :value="item.value"> </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="机构代码或邀请码" prop="title">
+                <el-input v-model="form.title" placeholder="请输入" size="small"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="机构名称" prop="title">
+                <el-input v-model="form.title" placeholder="请输入" size="small"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="姓名" prop="title">
+                <el-input v-model="form.title" placeholder="请输入" size="small"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="手机号" prop="title">
+                <el-input v-model="form.title" placeholder="请输入" size="small"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="密码" prop="title">
+                <el-input v-model="form.title" placeholder="请输入" size="small"></el-input>
+              </el-form-item>
+            </el-col>
+
             <el-form-item>
               <el-button class="btn" type="primary" size="mini" @click="onSubmit('form')">提交</el-button>
             </el-form-item>

+ 2 - 14
src/views/adminCenter/adminMech/index.vue

@@ -2,10 +2,7 @@
   <div id="index">
     <el-row>
       <el-col :span="24" class="main animate__animated animate__backInRight">
-        <el-col class="one">
-          <span>机构用户</span>
-        </el-col>
-        <el-col :span="24" class="two">
+        <el-col :span="24" class="one">
           <data-table :fields="fields" :opera="opera" :data="list" @query="search" :total="total" @edit="toEdit" @del="toDel" @reset="toReset">
             <template slot="selfbtn">
               <el-button type="primary" size="mini" @click="toAdd()">新增</el-button>
@@ -78,13 +75,4 @@ export default {
 };
 </script>
 
-<style lang="less" scoped>
-.main {
-  .one {
-    padding: 20px 0 20px 0px;
-    font-size: 26px;
-    font-weight: 700;
-    margin-right: 10px;
-  }
-}
-</style>
+<style lang="less" scoped></style>

+ 23 - 3
src/views/adminCenter/adminMessage/examine/index.vue

@@ -1,7 +1,11 @@
 <template>
   <div id="index">
     <el-row>
-      <el-col :span="24" class="main animate__animated animate__backInRight"> test </el-col>
+      <el-col :span="24" class="main animate__animated animate__backInRight">
+        <el-col :span="24" class="one">
+          <data-table :fields="fields" :opera="opera" :data="list" @query="search" :total="total" @del="toDel"> </data-table>
+        </el-col>
+      </el-col>
     </el-row>
   </div>
 </template>
@@ -13,10 +17,26 @@ export default {
   props: {},
   components: {},
   data: function () {
-    return {};
+    return {
+      //列头配置项
+      fields: [
+        { label: '名称', prop: 'name' },
+        { label: '发送时间', prop: 'name' },
+        { label: '是否已读', prop: 'name' },
+      ],
+      // 操作
+      opera: [{ label: '消息已读', method: 'read', confirm: true, type: 'danger' }],
+      list: [],
+      total: 0,
+    };
   },
   created() {},
-  methods: {},
+  methods: {
+    // 已读
+    toRead({ data }) {
+      console.log(data);
+    },
+  },
   computed: {
     ...mapState(['user']),
   },

+ 131 - 0
src/views/adminCenter/adminMessage/notice/detail.vue

@@ -0,0 +1,131 @@
+<template>
+  <div id="detail">
+    <el-row>
+      <el-col :span="24" class="main">
+        <el-col class="one">
+          <el-button type="primary" size="mini" @click="toReturn()">返回</el-button>
+        </el-col>
+        <el-col class="two">
+          <el-form :model="form" :rules="rules" ref="form" label-width="140px">
+            <el-col :span="13">
+              <el-form-item label="发送人" prop="title">
+                <el-input v-model="form.title" placeholder="吉林专利市场系统管理员" size="small" :disabled="true"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="13">
+              <el-form-item label="接收用户" prop="title">
+                <el-radio v-model="radio" label="1">所有用户</el-radio>
+                <el-radio v-model="radio" label="2">机构用户</el-radio>
+                <el-radio v-model="radio" label="3">平台用户</el-radio>
+                <el-radio v-model="radio" label="4">指定用户</el-radio>
+              </el-form-item>
+            </el-col>
+            <el-col :span="13">
+              <el-form-item label="发送内容" prop="title">
+                <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="textarea"> </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="13">
+              <el-form-item label="通知文件" prop="title">
+                <el-upload action="#" list-type="picture-card" :auto-upload="false">
+                  <i slot="default" class="el-icon-plus"></i>
+                  <div slot="file" slot-scope="{ file }">
+                    <img class="el-upload-list__item-thumbnail" :src="file.url" alt="" />
+                    <span class="el-upload-list__item-actions">
+                      <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
+                        <i class="el-icon-zoom-in"></i>
+                      </span>
+                      <span v-if="!disabled" class="el-upload-list__item-delete" @click="handleDownload(file)">
+                        <i class="el-icon-download"></i>
+                      </span>
+                      <span v-if="!disabled" class="el-upload-list__item-delete" @click="handleRemove(file)">
+                        <i class="el-icon-delete"></i>
+                      </span>
+                    </span>
+                  </div>
+                </el-upload>
+                <el-dialog :visible.sync="dialogVisible">
+                  <img width="100%" :src="dialogImageUrl" alt="" />
+                </el-dialog>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item>
+                <el-button class="btn" type="primary" size="mini" @click="onSubmit('form')">提交</el-button>
+              </el-form-item>
+            </el-col>
+          </el-form>
+        </el-col>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { mapState, createNamespacedHelpers } from 'vuex';
+export default {
+  name: 'detail',
+  props: {},
+  components: {},
+  data: function () {
+    return {
+      rules: {
+        title: [{ required: true, message: '请输入', trigger: 'blur' }],
+      },
+      form: {},
+      radio: '',
+      dialogImageUrl: '',
+      dialogVisible: false,
+      disabled: false,
+    };
+  },
+  created() {},
+  methods: {
+    onSubmit(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          this.$emit('onSubmit', { data: this.form });
+        } else {
+          console.log('error submit!!');
+          return false;
+        }
+      });
+    },
+    //返回
+    toReturn() {
+      this.$router.push({ path: '/adminCenter/adminMessage/notice/index' });
+    },
+    handleRemove(file) {
+      console.log(file);
+    },
+    handlePictureCardPreview(file) {
+      this.dialogImageUrl = file.url;
+      this.dialogVisible = true;
+    },
+    handleDownload(file) {
+      console.log(file);
+    },
+  },
+  computed: {
+    ...mapState(['user']),
+  },
+  metaInfo() {
+    return { title: this.$route.meta.title };
+  },
+  watch: {
+    test: {
+      deep: true,
+      immediate: true,
+      handler(val) {},
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.main {
+  .one {
+    padding: 0 0 20px 10px;
+  }
+}
+</style>

+ 34 - 3
src/views/adminCenter/adminMessage/notice/index.vue

@@ -1,7 +1,17 @@
 <template>
   <div id="index">
     <el-row>
-      <el-col :span="24" class="main animate__animated animate__backInRight"> test </el-col>
+      <el-col :span="24" class="main animate__animated animate__backInRight">
+        <el-col :span="24" class="one">
+          <data-table :fields="fields" :opera="opera" :data="list" @query="search" :total="total" @del="toDel">
+            <template slot="selfbtn">
+              <el-col :span="24" class="btn">
+                <el-button type="primary" size="mini" @click="toAdd()">新增</el-button>
+              </el-col>
+            </template>
+          </data-table>
+        </el-col>
+      </el-col>
     </el-row>
   </div>
 </template>
@@ -13,10 +23,31 @@ export default {
   props: {},
   components: {},
   data: function () {
-    return {};
+    return {
+      //列头配置项
+      fields: [
+        { label: '名称', prop: 'name', filter: true },
+        { label: '发送人', prop: 'name', filter: true },
+        { label: '发送时间', prop: 'name', filter: true },
+      ],
+      // 操作
+      opera: [{ label: '删除', method: 'del', confirm: true, type: 'danger' }],
+      list: [],
+      total: 0,
+    };
   },
   created() {},
-  methods: {},
+  methods: {
+    async search({ skip = 0, limit = 10, ...info } = {}) {},
+    // 添加用户
+    toAdd() {
+      this.$router.push({ path: '/adminCenter/adminMessage/notice/detail' });
+    },
+    // 刪除
+    toDel({ data }) {
+      console.log(data);
+    },
+  },
   computed: {
     ...mapState(['user']),
   },

+ 24 - 3
src/views/adminCenter/adminMessage/warning/index.vue

@@ -1,7 +1,11 @@
 <template>
   <div id="index">
     <el-row>
-      <el-col :span="24" class="main animate__animated animate__backInRight"> test </el-col>
+      <el-col :span="24" class="main animate__animated animate__backInRight">
+        <el-col :span="24" class="one">
+          <data-table :fields="fields" :opera="opera" :data="list" @query="search" :total="total" @del="toDel"> </data-table>
+        </el-col>
+      </el-col>
     </el-row>
   </div>
 </template>
@@ -13,10 +17,27 @@ export default {
   props: {},
   components: {},
   data: function () {
-    return {};
+    return {
+      //列头配置项
+      fields: [
+        { label: '名称', prop: 'name' },
+        { label: '发送时间', prop: 'name' },
+        { label: '缴费截止', prop: 'name' },
+        { label: '预警信息', prop: 'name' },
+      ],
+      // 操作
+      opera: [{ label: '删除', method: 'del', confirm: true, type: 'danger' }],
+      list: [],
+      total: 0,
+    };
   },
   created() {},
-  methods: {},
+  methods: {
+    // 刪除
+    toDel({ data }) {
+      console.log(data);
+    },
+  },
   computed: {
     ...mapState(['user']),
   },

+ 63 - 39
src/views/adminCenter/adminTea/detail.vue

@@ -4,48 +4,72 @@
       <el-col :span="24" class="main">
         <el-col class="one">
           <el-button type="primary" size="mini" @click="toReturn()">返回</el-button>
-          <span class="sp">咨询师-信息管理</span>
         </el-col>
         <el-col class="two">
           <el-form :model="form" :rules="rules" ref="form" label-width="140px">
-            <el-form-item label="用户类型" prop="name1">
-              <el-radio v-model="radio" label="1">咨询师</el-radio>
-              <el-radio v-model="radio" label="2">代理师</el-radio>
-              <el-radio v-model="radio" label="3">分析师</el-radio>
-            </el-form-item>
-            <el-form-item label="姓名" prop="title">
-              <el-input v-model="form.title" placeholder="请输入" size="small"></el-input>
-            </el-form-item>
-            <el-form-item label="手机号" prop="title">
-              <el-input v-model="form.title" placeholder="请输入" size="small"></el-input>
-            </el-form-item>
-            <el-form-item label="登录密码" prop="title">
-              <el-input v-model="form.title" placeholder="请输入" size="small"></el-input>
-            </el-form-item>
-            <el-form-item label="身份证号" prop="title">
-              <el-input v-model="form.title" placeholder="请输入" size="small"></el-input>
-            </el-form-item>
-            <el-form-item label="电子邮箱" prop="title">
-              <el-input v-model="form.title" placeholder="请输入" size="small"></el-input>
-            </el-form-item>
-            <el-form-item label="联系地址" prop="title">
-              <el-input v-model="form.title" placeholder="请输入" size="small"></el-input>
-            </el-form-item>
-            <el-form-item label="职位职称" prop="title">
-              <el-input v-model="form.title" placeholder="请输入" size="small"></el-input>
-            </el-form-item>
-            <el-form-item label="院校" prop="title">
-              <el-input v-model="form.title" placeholder="请输入" size="small"></el-input>
-            </el-form-item>
-            <el-form-item label="专业" prop="title">
-              <el-input v-model="form.title" placeholder="请输入" size="small"></el-input>
-            </el-form-item>
-            <el-form-item label="办公电话" prop="title">
-              <el-input v-model="form.title" placeholder="请输入" size="small"></el-input>
-            </el-form-item>
-            <el-form-item>
-              <el-button class="btn" type="primary" size="mini" @click="onSubmit('form')">提交</el-button>
-            </el-form-item>
+            <el-col :span="24">
+              <el-form-item label="用户类型" prop="name1">
+                <el-radio v-model="radio" label="1">咨询师</el-radio>
+                <el-radio v-model="radio" label="2">代理师</el-radio>
+                <el-radio v-model="radio" label="3">分析师</el-radio>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="姓名" prop="title">
+                <el-input v-model="form.title" placeholder="请输入" size="small"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="手机号" prop="title">
+                <el-input v-model="form.title" placeholder="请输入" size="small"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="登录密码" prop="title">
+                <el-input v-model="form.title" placeholder="请输入" size="small"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="身份证号" prop="title">
+                <el-input v-model="form.title" placeholder="请输入" size="small"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="电子邮箱" prop="title">
+                <el-input v-model="form.title" placeholder="请输入" size="small"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="联系地址" prop="title">
+                <el-input v-model="form.title" placeholder="请输入" size="small"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="职位职称" prop="title">
+                <el-input v-model="form.title" placeholder="请输入" size="small"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="院校" prop="title">
+                <el-input v-model="form.title" placeholder="请输入" size="small"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="专业" prop="title">
+                <el-input v-model="form.title" placeholder="请输入" size="small"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="办公电话" prop="title">
+                <el-input v-model="form.title" placeholder="请输入" size="small"></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="24">
+              <el-form-item>
+                <el-button class="btn" type="primary" size="mini" @click="onSubmit('form')">提交</el-button>
+              </el-form-item>
+            </el-col>
           </el-form>
         </el-col>
       </el-col>

+ 3 - 16
src/views/adminCenter/adminTea/index.vue

@@ -2,14 +2,10 @@
   <div id="index">
     <el-row>
       <el-col :span="24" class="main animate__animated animate__backInRight">
-        <el-col class="one">
-          <span>咨询师</span>
-        </el-col>
-        <el-col class="two"> </el-col>
-        <el-col :span="24" class="thr">
+        <el-col :span="24" class="one">
           <data-table :fields="fields" :opera="opera" :data="list" @query="search" :total="total" @edit="toEdit" @del="toDel">
             <template slot="selfbtn">
-              <el-button type="primary" size="mini" @click="toAdd()">添加用户</el-button>
+              <el-button type="primary" size="mini" @click="toAdd()">新增</el-button>
             </template>
           </data-table>
         </el-col>
@@ -73,13 +69,4 @@ export default {
 };
 </script>
 
-<style lang="less" scoped>
-.main {
-  .one {
-    padding: 20px 0 20px 0px;
-    font-size: 26px;
-    font-weight: 700;
-    margin-right: 10px;
-  }
-}
-</style>
+<style lang="less" scoped></style>

+ 76 - 49
src/views/adminCenter/adminUser/detail.vue

@@ -4,58 +4,85 @@
       <el-col :span="24" class="main">
         <el-col class="one">
           <el-button type="primary" size="mini" @click="toReturn()">返回</el-button>
-          <span class="sp">平台用户-信息管理</span>
         </el-col>
         <el-col class="two">
           <el-form :model="form" :rules="rules" ref="form" label-width="140px">
-            <el-form-item label="邀请码" prop="name1">
-              <el-select v-model="form.name1" clearable filterable placeholder="请选择" style="width: 100%" size="small">
-                <el-option v-for="item in name1List" :key="item._id" :label="item._id" :value="item.name"> </el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="机构代码或邀请码" prop="title">
-              <el-input v-model="form.title" placeholder="请输入机构代码或邀请码" size="small"></el-input>
-            </el-form-item>
-            <el-form-item label="姓名" prop="title">
-              <el-input v-model="form.title" placeholder="请输入姓名" size="small"></el-input>
-            </el-form-item>
-            <el-form-item label="手机号" prop="title">
-              <el-input v-model="form.title" placeholder="请输入手机号" size="small"></el-input>
-            </el-form-item>
-            <el-form-item label="登录密码" prop="title">
-              <el-input v-model="form.title" placeholder="请输入登录密码" size="small"></el-input>
-            </el-form-item>
-            <el-form-item label="身份证号" prop="title">
-              <el-input v-model="form.title" placeholder="请输入身份证号" size="small"></el-input>
-            </el-form-item>
-            <el-form-item label="电子邮箱" prop="title">
-              <el-input v-model="form.title" placeholder="请输入电子邮箱" size="small"></el-input>
-            </el-form-item>
-            <el-form-item label="联系地址" prop="title">
-              <el-input v-model="form.title" placeholder="请输入联系地址" size="small"></el-input>
-            </el-form-item>
-            <el-form-item label="职务职称" prop="title">
-              <el-input v-model="form.title" placeholder="请输入职务职称" size="small"></el-input>
-            </el-form-item>
-            <el-form-item label="院校" prop="title">
-              <el-input v-model="form.title" placeholder="请输入院校" size="small"></el-input>
-            </el-form-item>
-            <el-form-item label="专业" prop="title">
-              <el-input v-model="form.title" placeholder="请输入专业" size="small"></el-input>
-            </el-form-item>
-            <el-form-item label="所属辖区" prop="name2">
-              <el-select v-model="form.name2" clearable filterable placeholder="请选择" style="width: 100%" size="small">
-                <el-option v-for="item in name2List" :key="item.value" :label="item.label" :value="item.value"> </el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="审核状态" prop="name1">
-              <el-radio v-model="radio" label="1">待审</el-radio>
-              <el-radio v-model="radio" label="2">通过</el-radio>
-              <el-radio v-model="radio" label="3">拒绝</el-radio>
-            </el-form-item>
-            <el-form-item>
-              <el-button class="btn" type="primary" size="mini" @click="onSubmit('form')">提交保存</el-button>
-            </el-form-item>
+            <el-col :span="12">
+              <el-form-item label="邀请码" prop="name1">
+                <el-select v-model="form.name1" clearable filterable placeholder="请选择" style="width: 100%" size="small">
+                  <el-option v-for="item in name1List" :key="item._id" :label="item._id" :value="item.name"> </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="机构代码或邀请码" prop="title">
+                <el-input v-model="form.title" placeholder="请输入机构代码或邀请码" size="small"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="姓名" prop="title">
+                <el-input v-model="form.title" placeholder="请输入姓名" size="small"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="手机号" prop="title">
+                <el-input v-model="form.title" placeholder="请输入手机号" size="small"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="登录密码" prop="title">
+                <el-input v-model="form.title" placeholder="请输入登录密码" size="small"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="身份证号" prop="title">
+                <el-input v-model="form.title" placeholder="请输入身份证号" size="small"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="电子邮箱" prop="title">
+                <el-input v-model="form.title" placeholder="请输入电子邮箱" size="small"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="联系地址" prop="title">
+                <el-input v-model="form.title" placeholder="请输入联系地址" size="small"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="职务职称" prop="title">
+                <el-input v-model="form.title" placeholder="请输入职务职称" size="small"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="院校" prop="title">
+                <el-input v-model="form.title" placeholder="请输入院校" size="small"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="专业" prop="title">
+                <el-input v-model="form.title" placeholder="请输入专业" size="small"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="所属辖区" prop="name2">
+                <el-select v-model="form.name2" clearable filterable placeholder="请选择" style="width: 100%" size="small">
+                  <el-option v-for="item in name2List" :key="item.value" :label="item.label" :value="item.value"> </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="审核状态" prop="name1">
+                <el-radio v-model="radio" label="1">待审</el-radio>
+                <el-radio v-model="radio" label="2">通过</el-radio>
+                <el-radio v-model="radio" label="3">拒绝</el-radio>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item>
+                <el-button class="btn" type="primary" size="mini" @click="onSubmit('form')">提交保存</el-button>
+              </el-form-item>
+            </el-col>
           </el-form>
         </el-col>
       </el-col>

+ 11 - 12
src/views/adminCenter/adminUser/index.vue

@@ -2,16 +2,14 @@
   <div id="index">
     <el-row>
       <el-col :span="24" class="main animate__animated animate__backInRight">
-        <el-col class="one">
-          <span>平台用户</span>
-        </el-col>
-        <el-col class="two"> </el-col>
-        <el-col :span="24" class="thr">
+        <el-col :span="24" class="one">
           <data-table :fields="fields" :opera="opera" :data="list" @query="search" :total="total" @edit="toEdit" @del="toDel" @reset="toReset">
             <template slot="selfbtn">
-              <el-button type="primary" size="mini" @click="toAdd()">添加用户</el-button>
-              <el-button type="primary" size="mini" @click="toLogin()">批量注册用户</el-button>
-              <el-button type="primary" size="mini" @click="toExpert()">批量导出用户</el-button>
+              <el-col :span="24" class="btn">
+                <el-button type="primary" size="mini" @click="toAdd()">添加用户</el-button>
+                <el-button type="primary" size="mini" @click="toLogin()">批量注册用户</el-button>
+                <el-button type="primary" size="mini" @click="toExpert()">批量导出用户</el-button>
+              </el-col>
             </template>
           </data-table>
         </el-col>
@@ -92,10 +90,11 @@ export default {
 <style lang="less" scoped>
 .main {
   .one {
-    padding: 20px 0 20px 0px;
-    font-size: 26px;
-    font-weight: 700;
-    margin-right: 10px;
+    .btn {
+      .el-button {
+        margin: 0 0 5px 0;
+      }
+    }
   }
 }
 </style>

+ 0 - 1
src/views/adminCenter/adminUser/register.vue

@@ -4,7 +4,6 @@
       <el-col :span="24" class="main">
         <el-col class="one">
           <el-button type="primary" size="mini" @click="toReturn()">返回</el-button>
-          <span class="sp">平台用户-批量注册用户</span>
         </el-col>
         <el-col class="two">
           <el-button type="primary" size="mini">数据模板下载</el-button>