From 25194cc84fa2836f819ff940db68eea9a1371486 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Fri, 5 Jun 2020 15:01:53 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E5=BF=83=E7=90=86=E5=92=A8=E8=AF=A2?=
 =?UTF-8?q?=E5=B8=88vue=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../psychology/psychologist-add-or-update.vue | 276 ++++++++++++++++++
 src/views/modules/psychology/psychologist.vue | 103 +++++++
 .../psychologisttitle-add-or-update.vue       | 113 +++++++
 .../modules/psychology/psychologisttitle.vue  |  69 +++++
 ...sychologisttitlerelation-add-or-update.vue | 131 +++++++++
 .../psychology/psychologisttitlerelation.vue  |  73 +++++
 6 files changed, 765 insertions(+)
 create mode 100644 src/views/modules/psychology/psychologist-add-or-update.vue
 create mode 100644 src/views/modules/psychology/psychologist.vue
 create mode 100644 src/views/modules/psychology/psychologisttitle-add-or-update.vue
 create mode 100644 src/views/modules/psychology/psychologisttitle.vue
 create mode 100644 src/views/modules/psychology/psychologisttitlerelation-add-or-update.vue
 create mode 100644 src/views/modules/psychology/psychologisttitlerelation.vue

diff --git a/src/views/modules/psychology/psychologist-add-or-update.vue b/src/views/modules/psychology/psychologist-add-or-update.vue
new file mode 100644
index 0000000..d1d5605
--- /dev/null
+++ b/src/views/modules/psychology/psychologist-add-or-update.vue
@@ -0,0 +1,276 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+          <el-form-item label="姓名" prop="name">
+          <el-input v-model="dataForm.name" placeholder="咨询师姓名"></el-input>
+      </el-form-item>
+        <el-form-item label="民警照片"
+                      v-loading="loading"
+                      prop="avatar">
+            <el-upload class="avatar-uploader"
+                       :action="uploadUrl"
+                       :show-file-list="false"
+                       :on-success="handleAvatarActSuccess"
+                       :on-error="handelError"
+                       :before-upload="beforeAvatarUpload">
+                <img v-if="dataForm.avatar"
+                     :src="dataForm.avatar"
+                     class="avatar">
+                <i v-else
+                   class="el-icon-plus avatar-uploader-icon"></i>
+                <div slot="tip"
+                     class="el-upload__tip">只能上传jpg/png文件，且不超过500kb
+                </div>
+            </el-upload>
+        </el-form-item>
+          <el-form-item label="联系方式" prop="mobile">
+          <el-input v-model="dataForm.mobile" placeholder="咨询师联系方式"></el-input>
+      </el-form-item>
+          <el-form-item label="性别" prop="sex">
+              <el-select v-model="dataForm.sex"
+                         placeholder="性别">
+                  <el-option v-for="item in sex"
+                             :key="item.dictValue"
+                             :label="item.dictName"
+                             :value="item.dictValue">
+                  </el-option>
+              </el-select>
+      </el-form-item>
+        <el-form-item label="绑定用户" prop="userId">
+            <el-select
+                    style="width: 100%"
+                    v-model="dataForm.userId"
+                    filterable
+                    remote
+                    reserve-keyword
+                    placeholder="请输入关键词"
+                    :remote-method="remoteMethod"
+                    :loading="loading">
+                <el-option
+                        v-for="item in options"
+                        :key="item.id"
+                        :label="item.realName"
+                        :value="item.id">
+                    <span style="float: left">{{ item.realName }}</span>
+                    <span style="float: right; color: #8492a6; font-size: 13px">{{ item.mobile }}</span>
+                </el-option>
+            </el-select>
+        </el-form-item>
+          <el-form-item label="座右铭" prop="motto">
+          <el-input v-model="dataForm.motto" placeholder="座右铭"></el-input>
+      </el-form-item>
+          <el-form-item label="简介" prop="briefIntroduction">
+          <el-input v-model="dataForm.briefIntroduction" placeholder="简介"></el-input>
+      </el-form-item>
+          <el-form-item label="排序" prop="sort">
+          <el-input v-model="dataForm.sort" type="number" placeholder="排序 从小到大"></el-input>
+      </el-form-item>
+      </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+import Cookies from "js-cookie";
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        name: '',
+        avatar: '',
+        mobile: '',
+        sex: '',
+        userId: '',
+        motto: '',
+        briefIntroduction: '',
+        sort: '',
+        displayFlag: '',
+        delFlag: '',
+        revision: '',
+        createdBy: '',
+        createdTime: '',
+        updatedBy: '',
+        updatedTime: ''
+      },
+        loading: false,
+        uploadUrl: '',
+        options: [],
+        sex: [
+            { dictValue: '1', dictName: '男' },
+            { dictValue: '0', dictName: '女' }
+        ]
+    }
+  },
+    created () {
+        this.$nextTick(() => {
+            this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/oss/file/upload?token=${Cookies.get('token')}`
+        });
+    },
+    mounted() {
+        this.getUser('');
+    },
+  computed: {
+    dataRule () {
+      return {
+        name: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        avatar: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        mobile: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        sex: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        userId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        motto: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        briefIntroduction: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        sort: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        displayFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        delFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        revision: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/property/psychologist/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => {})
+    },
+      getUser (userInfo) {
+          let postData = { roleId: 'psychologist', userInfo: userInfo };
+
+          this.$http.get(`/sys/user/getRoleMembers`, { params: postData}).then(({ data: res }) => {
+              if (res.code !== 0) {
+                  return this.$message.error(res.msg)
+              }
+              this.options={
+                  ...res.data
+              };
+          }).catch(() => {})
+      },
+      remoteMethod(query) {
+          if (query !== '') {
+              this.loading = true;
+              setTimeout(() => {
+                  this.loading = false;
+                  this.getUser(query);
+              }, 200);
+          } else {
+              this.options = [];
+          }
+      },
+      handleAvatarActSuccess (res, file) {
+          this.loading = false
+          this.dataForm.avatar = res.data.url
+      },
+      beforeAvatarUpload (file) {
+          this.loading = true
+      },
+      handelError () {
+          this.loading = false
+      },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/property/psychologist/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => {})
+      })
+    }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
+</script>
+<style scoped>
+    .avatar-uploader .el-upload {
+        border: 1px dashed #d9d9d9;
+        border-radius: 6px;
+        cursor: pointer;
+        position: relative;
+        overflow: hidden;
+    }
+
+    .avatar-uploader .el-upload:hover {
+        border-color: #409eff;
+    }
+
+    .avatar-uploader-icon {
+        font-size: 28px;
+        color: #8c939d;
+        width: 178px;
+        height: 178px;
+        line-height: 178px;
+        text-align: center;
+    }
+
+    .avatar {
+        width: 178px;
+        height: 178px;
+        display: block;
+    }
+</style>
\ No newline at end of file
diff --git a/src/views/modules/psychology/psychologist.vue b/src/views/modules/psychology/psychologist.vue
new file mode 100644
index 0000000..3d49fe7
--- /dev/null
+++ b/src/views/modules/psychology/psychologist.vue
@@ -0,0 +1,103 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-__psychologist}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item label="姓名">
+          <el-input v-model="dataForm.name" clearable></el-input>
+        </el-form-item>
+        <el-form-item label="联系方式">
+          <el-input v-model="dataForm.mobile" clearable></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('psychology:psychologist:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('psychology:psychologist:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column prop="name" label="姓名" header-align="center" align="center"></el-table-column>
+        <el-table-column align="center"
+                         label="照片"
+                         width="120"
+                         :show-overflow-tooltip="true"
+                         prop="avatar">
+          <template slot-scope="scope">
+            <el-popover placement="right"
+                        title=""
+                        trigger="click"
+                        class="big_image">
+              <el-image slot="reference"
+                        min-width="70"
+                        height="70"
+                        v-if="scope.row.avatar"
+                        :src="scope.row.avatar"
+                        :alt="scope.row.avatar"></el-image>
+              <img class="big_image"
+                   :src="scope.row.avatar"/>
+            </el-popover>
+          </template>
+        </el-table-column>
+        <el-table-column prop="mobile" label="联系方式" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="sex" label="性别" header-align="center" align="center">
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.sex === '0'" size="small" type="danger">女</el-tag>
+            <el-tag v-else size="small" type="success">男</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="motto" label="座右铭" header-align="center" align="center"></el-table-column>
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+          <template slot-scope="scope">
+            <el-button v-if="$hasPermission('psychology:psychologist:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('psychology:psychologist:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle">
+      </el-pagination>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './psychologist-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/property/psychologist/page',
+        getDataListIsPage: true,
+        deleteURL: '/property/psychologist',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: ''
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  }
+}
+</script>
+<style scoped>
+  .big_image {
+    width: 200px !important;
+    height: 200px !important;;
+  }
+</style>
\ No newline at end of file
diff --git a/src/views/modules/psychology/psychologisttitle-add-or-update.vue b/src/views/modules/psychology/psychologisttitle-add-or-update.vue
new file mode 100644
index 0000000..5cdfb3a
--- /dev/null
+++ b/src/views/modules/psychology/psychologisttitle-add-or-update.vue
@@ -0,0 +1,113 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+          <el-form-item label="头衔" prop="title">
+          <el-input v-model="dataForm.title" placeholder="头衔"></el-input>
+      </el-form-item>
+          <el-form-item label="头衔编码" prop="code">
+          <el-input v-model="dataForm.code" placeholder="头衔编码"></el-input>
+      </el-form-item>
+      </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        title: '',
+        code: '',
+        delFlag: '',
+        revision: '',
+        createdBy: '',
+        createdTime: '',
+        updatedBy: '',
+        updatedTime: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        title: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        code: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        delFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        revision: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/property/psychologisttitle/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => {})
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/property/psychologisttitle/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => {})
+      })
+    }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
+</script>
diff --git a/src/views/modules/psychology/psychologisttitle.vue b/src/views/modules/psychology/psychologisttitle.vue
new file mode 100644
index 0000000..07d8e78
--- /dev/null
+++ b/src/views/modules/psychology/psychologisttitle.vue
@@ -0,0 +1,69 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-__psychologisttitle}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item label="头衔">
+          <el-input v-model="dataForm.title" clearable></el-input>
+        </el-form-item>
+        <el-form-item label="头衔编码">
+          <el-input v-model="dataForm.code" clearable></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('psychology:title:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('psychology:title:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column prop="title" label="头衔" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="code" label="头衔编码" header-align="center" align="center"></el-table-column>
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+          <template slot-scope="scope">
+            <el-button v-if="$hasPermission('psychology:title:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('psychology:title:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle">
+      </el-pagination>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './psychologisttitle-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/property/psychologisttitle/page',
+        getDataListIsPage: true,
+        deleteURL: '/property/psychologisttitle',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: ''
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  }
+}
+</script>
diff --git a/src/views/modules/psychology/psychologisttitlerelation-add-or-update.vue b/src/views/modules/psychology/psychologisttitlerelation-add-or-update.vue
new file mode 100644
index 0000000..4d4d9cc
--- /dev/null
+++ b/src/views/modules/psychology/psychologisttitlerelation-add-or-update.vue
@@ -0,0 +1,131 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+          <el-form-item label="头衔id" prop="titleId">
+          <el-input v-model="dataForm.titleId" placeholder="头衔id"></el-input>
+      </el-form-item>
+          <el-form-item label="咨询师id" prop="psychologistId">
+          <el-input v-model="dataForm.psychologistId" placeholder="咨询师id"></el-input>
+      </el-form-item>
+          <el-form-item label="删除标记 0：未删除，1：已删除" prop="delFlag">
+          <el-input v-model="dataForm.delFlag" placeholder="删除标记 0：未删除，1：已删除"></el-input>
+      </el-form-item>
+          <el-form-item label="乐观锁" prop="revision">
+          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
+      </el-form-item>
+          <el-form-item label="创建人" prop="createdBy">
+          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
+      </el-form-item>
+          <el-form-item label="创建时间" prop="createdTime">
+          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
+      </el-form-item>
+          <el-form-item label="更新人" prop="updatedBy">
+          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
+      </el-form-item>
+          <el-form-item label="更新时间" prop="updatedTime">
+          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
+      </el-form-item>
+      </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        titleId: '',
+        psychologistId: '',
+        delFlag: '',
+        revision: '',
+        createdBy: '',
+        createdTime: '',
+        updatedBy: '',
+        updatedTime: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        titleId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        psychologistId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        delFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        revision: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`//psychologisttitlerelation/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => {})
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'put']('//psychologisttitlerelation/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => {})
+      })
+    }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
+</script>
diff --git a/src/views/modules/psychology/psychologisttitlerelation.vue b/src/views/modules/psychology/psychologisttitlerelation.vue
new file mode 100644
index 0000000..035c398
--- /dev/null
+++ b/src/views/modules/psychology/psychologisttitlerelation.vue
@@ -0,0 +1,73 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-__psychologisttitlerelation}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item>
+          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission(':psychologisttitlerelation:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission(':psychologisttitlerelation:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column prop="id" label="主键" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="titleId" label="头衔id" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="psychologistId" label="咨询师id" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="delFlag" label="删除标记 0：未删除，1：已删除" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="revision" label="乐观锁" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createdBy" label="创建人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="updatedBy" label="更新人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="updatedTime" label="更新时间" header-align="center" align="center"></el-table-column>
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+          <template slot-scope="scope">
+            <el-button v-if="$hasPermission(':psychologisttitlerelation:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission(':psychologisttitlerelation:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle">
+      </el-pagination>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './psychologisttitlerelation-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '//psychologisttitlerelation/page',
+        getDataListIsPage: true,
+        deleteURL: '//psychologisttitlerelation',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: ''
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  }
+}
+</script>

From 37b8b5ab9697668100027240bddd831dcc346f8b Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Fri, 5 Jun 2020 16:24:29 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E5=BF=83=E7=90=86=E5=92=A8=E8=AF=A2?=
 =?UTF-8?q?=E5=B8=88=E5=A4=B4=E8=A1=94vue.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/psychology/psychologisttitle-add-or-update.vue | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/views/modules/psychology/psychologisttitle-add-or-update.vue b/src/views/modules/psychology/psychologisttitle-add-or-update.vue
index 5cdfb3a..7f77e73 100644
--- a/src/views/modules/psychology/psychologisttitle-add-or-update.vue
+++ b/src/views/modules/psychology/psychologisttitle-add-or-update.vue
@@ -7,6 +7,9 @@
           <el-form-item label="头衔编码" prop="code">
           <el-input v-model="dataForm.code" placeholder="头衔编码"></el-input>
       </el-form-item>
+        <el-form-item label="排序" prop="sort">
+            <el-input v-model="dataForm.sort" type="number" placeholder="排序 从小到大"></el-input>
+        </el-form-item>
       </el-form>
     <template slot="footer">
       <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
@@ -25,6 +28,7 @@ export default {
         id: '',
         title: '',
         code: '',
+        sort: '',
         delFlag: '',
         revision: '',
         createdBy: '',
@@ -43,6 +47,9 @@ export default {
         code: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
+          sort: [
+              { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+          ],
         delFlag: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],

From d87748b8cf4fbb0c47dfc3886ec46902fecbf5d1 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Fri, 5 Jun 2020 18:08:59 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E5=BF=83=E7=90=86=E5=92=A8=E8=AF=A2?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=B4=E8=A1=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../psychology/psychologist-add-or-update.vue | 35 ++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/psychology/psychologist-add-or-update.vue b/src/views/modules/psychology/psychologist-add-or-update.vue
index d1d5605..cc77a82 100644
--- a/src/views/modules/psychology/psychologist-add-or-update.vue
+++ b/src/views/modules/psychology/psychologist-add-or-update.vue
@@ -62,6 +62,23 @@
           <el-form-item label="简介" prop="briefIntroduction">
           <el-input v-model="dataForm.briefIntroduction" placeholder="简介"></el-input>
       </el-form-item>
+        <el-form-item label="头衔" prop="titles">
+            <el-select
+                    style="width: 100%"
+                    v-model="dataForm.titles"
+                    multiple
+                    filterable
+                    reserve-keyword
+                    placeholder="请输入关键词"
+                    :loading="loading">
+                <el-option
+                        v-for="item in titles"
+                        :key="item.id"
+                        :label="item.title"
+                        :value="item.id">
+                </el-option>
+            </el-select>
+        </el-form-item>
           <el-form-item label="排序" prop="sort">
           <el-input v-model="dataForm.sort" type="number" placeholder="排序 从小到大"></el-input>
       </el-form-item>
@@ -96,11 +113,13 @@ export default {
         createdBy: '',
         createdTime: '',
         updatedBy: '',
-        updatedTime: ''
+        updatedTime: '',
+          titles: [],
       },
         loading: false,
         uploadUrl: '',
         options: [],
+        titles: [],
         sex: [
             { dictValue: '1', dictName: '男' },
             { dictValue: '0', dictName: '女' }
@@ -113,7 +132,10 @@ export default {
         });
     },
     mounted() {
+      this.options=[];
+      this.titles=[];
         this.getUser('');
+        this.getTitle();
     },
   computed: {
     dataRule () {
@@ -200,6 +222,17 @@ export default {
               };
           }).catch(() => {})
       },
+      getTitle () {
+          let postData = { delFlag: '0' };
+          this.$http.get(`/property/psychologisttitle/list`, { params: postData}).then(({ data: res }) => {
+              if (res.code !== 0) {
+                  return this.$message.error(res.msg)
+              }
+              this.titles={
+                  ...res.data
+              };
+          }).catch(() => {})
+      },
       remoteMethod(query) {
           if (query !== '') {
               this.loading = true;

From 2ff5ac129b2e425be07db0b291a9474c8fbe690a Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Wed, 10 Jun 2020 15:30:44 +0800
Subject: [PATCH 4/6] =?UTF-8?q?PC=E7=AB=AF=E9=A1=B5=E9=9D=A2=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=EF=BC=9A=E7=BB=BC=E6=B2=BB=E7=9F=9B=E8=B0=83=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../conflictmediate-add-or-update.vue         | 194 ++++++++++++++++++
 .../modules/conflict/conflictmediate.vue      | 164 +++++++++++++++
 2 files changed, 358 insertions(+)
 create mode 100644 src/views/modules/conflict/conflictmediate-add-or-update.vue
 create mode 100644 src/views/modules/conflict/conflictmediate.vue

diff --git a/src/views/modules/conflict/conflictmediate-add-or-update.vue b/src/views/modules/conflict/conflictmediate-add-or-update.vue
new file mode 100644
index 0000000..f62d199
--- /dev/null
+++ b/src/views/modules/conflict/conflictmediate-add-or-update.vue
@@ -0,0 +1,194 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+          <el-form-item label="提交人ID" prop="userId">
+          <el-input v-model="dataForm.userId" placeholder="提交人ID"></el-input>
+      </el-form-item>
+          <el-form-item label="矛盾纠纷类型" prop="conflictType">
+          <el-input v-model="dataForm.conflictType" placeholder="矛盾纠纷类型"></el-input>
+      </el-form-item>
+          <el-form-item label="行成原因" prop="conflictReason">
+          <el-input v-model="dataForm.conflictReason" placeholder="行成原因"></el-input>
+      </el-form-item>
+          <el-form-item label="涉及人数" prop="involvedNum">
+          <el-input v-model="dataForm.involvedNum" placeholder="涉及人数"></el-input>
+      </el-form-item>
+          <el-form-item label="挑头骨干人员" prop="mainstayLeader">
+          <el-input v-model="dataForm.mainstayLeader" placeholder="挑头骨干人员"></el-input>
+      </el-form-item>
+          <el-form-item label="责任单位" prop="responsibleDept">
+          <el-input v-model="dataForm.responsibleDept" placeholder="责任单位"></el-input>
+      </el-form-item>
+          <el-form-item label="责任人" prop="responsiblePeople">
+          <el-input v-model="dataForm.responsiblePeople" placeholder="责任人"></el-input>
+      </el-form-item>
+          <el-form-item label="主要采取措施" prop="majorMeasures">
+          <el-input v-model="dataForm.majorMeasures" placeholder="主要采取措施"></el-input>
+      </el-form-item>
+          <el-form-item label="目前稳控情况" prop="currentSituation">
+          <el-input v-model="dataForm.currentSituation" placeholder="目前稳控情况"></el-input>
+      </el-form-item>
+          <el-form-item label="备注" prop="remark">
+          <el-input v-model="dataForm.remark" placeholder="备注"></el-input>
+      </el-form-item>
+          <el-form-item label="提报时间" prop="submitTime">
+          <el-input v-model="dataForm.submitTime" placeholder="提报时间"></el-input>
+      </el-form-item>
+          <el-form-item label="删除标记 0：未删除，1：已删除" prop="delFlag">
+          <el-input v-model="dataForm.delFlag" placeholder="删除标记 0：未删除，1：已删除"></el-input>
+      </el-form-item>
+          <el-form-item label="乐观锁" prop="revision">
+          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
+      </el-form-item>
+          <el-form-item label="创建人" prop="createdBy">
+          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
+      </el-form-item>
+          <el-form-item label="创建时间" prop="createdTime">
+          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
+      </el-form-item>
+          <el-form-item label="更新人" prop="updatedBy">
+          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
+      </el-form-item>
+          <el-form-item label="更新时间" prop="updatedTime">
+          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
+      </el-form-item>
+      </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        userId: '',
+        conflictType: '',
+        conflictReason: '',
+        involvedNum: '',
+        mainstayLeader: '',
+        responsibleDept: '',
+        responsiblePeople: '',
+        majorMeasures: '',
+        currentSituation: '',
+        remark: '',
+        submitTime: '',
+        delFlag: '',
+        revision: '',
+        createdBy: '',
+        createdTime: '',
+        updatedBy: '',
+        updatedTime: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        userId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        conflictType: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        conflictReason: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        involvedNum: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        mainstayLeader: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        responsibleDept: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        responsiblePeople: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        majorMeasures: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        currentSituation: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        remark: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        submitTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        delFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        revision: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/property/conflictmediate/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => {})
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/property/conflictmediate/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => {})
+      })
+    }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
+</script>
diff --git a/src/views/modules/conflict/conflictmediate.vue b/src/views/modules/conflict/conflictmediate.vue
new file mode 100644
index 0000000..7e75278
--- /dev/null
+++ b/src/views/modules/conflict/conflictmediate.vue
@@ -0,0 +1,164 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-__conflictmediate}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item label="社区">
+          <el-cascader
+                  :options="options"
+                  @change="handleChange"
+                  clearable>
+          </el-cascader>
+        </el-form-item>
+        <el-form-item label="网格">
+          <el-cascader
+                  :options="gridOptions"
+                  @change="handleChangeGrid"
+                  clearable>
+          </el-cascader>
+        </el-form-item>
+        <el-form-item label="开始时间"
+                      prop="startTime">
+          <el-date-picker v-model="dataForm.startTime"
+                          type="date"
+                          :picker-options="pickerBeginDateBefore"
+                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="结束时间"
+                      prop="endTime">
+          <el-date-picker v-model="dataForm.endTime"
+                          type="date"
+                          :picker-options="pickerBeginDateAfter"
+                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('conflict:conflictmediate:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('conflict:conflictmediate:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column prop="userName" label="上报网格长" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="allDeptNames" label="所属机构" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="conflictType" label="矛盾纠纷类型" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="conflictReason" label="行成原因" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="involvedNum" label="涉及人数" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="mainstayLeader" label="挑头骨干人员" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="responsibleDept" label="责任单位" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="responsiblePeople" label="责任人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="majorMeasures" label="主要采取措施" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="currentSituation" label="目前稳控情况" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="remark" label="备注" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="submitTime" label="提报时间" header-align="center" align="center"></el-table-column>
+
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+          <template slot-scope="scope">
+            <el-button v-if="$hasPermission('conflict:conflictmediate:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('conflict:conflictmediate:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle">
+      </el-pagination>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './conflictmediate-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/property/conflictmediate/page',
+        getDataListIsPage: true,
+        deleteURL: '/property/conflictmediate',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: ''
+      },
+      options: [],
+      gridOptions: [],
+      pickerBeginDateBefore: {
+        disabledDate: (time) => {
+          let beginDateVal = this.dataForm.startTime
+          if (beginDateVal) {
+            return time.getTime() > new Date(beginDateVal).getTime()
+          }
+        }
+      },
+      pickerBeginDateAfter: {
+        disabledDate: (time) => {
+          let EndDateVal = this.dataForm.endTime
+          if (EndDateVal) {
+            return time.getTime() < new Date(EndDateVal).getTime()
+          }
+        }
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  },
+  mounted () {
+    // 获取下拉菜单
+    this.getByLoginUser()
+    // 获取下拉菜单
+    this.getGridByLoginUser()
+  },
+  methods: {
+    handleChange (value) {
+      this.dataForm.comm = value.slice(-1).shift()
+    },
+    handleChangeGrid (value) {
+      this.dataForm.grid = value.slice(-1).shift()
+    },
+    getByLoginUser () {
+      this.$http
+              .get(`/sys/user/deptOptions/getMiddleByLoginUser`)
+              .then(({ data: res }) => {
+                if (res.code !== 0) {
+                  return this.$message.error(res.msg)
+                }
+                this.options = res.data.options
+              })
+              .catch(() => {
+              })
+    },
+    getGridByLoginUser () {
+      this.$http
+              .get(`/sys/user/deptOptions/getBusinessDeptByUser`)
+              .then(({ data: res }) => {
+                if (res.code !== 0) {
+                  return this.$message.error(res.msg)
+                }
+                this.gridOptions = res.data.options
+              })
+              .catch(() => {
+              })
+    },
+  }
+}
+</script>

From d2b82a037f0cdbc42c3240377bb2b0064d9de181 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Wed, 10 Jun 2020 16:11:42 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=20PC=E7=AB=AF=E9=A1=B5=E9=9D=A2=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=EF=BC=9A=E7=BB=BC=E6=B2=BB=E7=9F=9B=E8=B0=83=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/conflict/conflictmediate.vue | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/conflict/conflictmediate.vue b/src/views/modules/conflict/conflictmediate.vue
index 7e75278..ad39a0b 100644
--- a/src/views/modules/conflict/conflictmediate.vue
+++ b/src/views/modules/conflict/conflictmediate.vue
@@ -39,6 +39,11 @@
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('conflict:conflictmediate:export')"
+                     type="primary"
+                     @click="exportHandle()">{{ $t('export') }}</el-button>
+        </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('conflict:conflictmediate:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
@@ -47,7 +52,13 @@
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
-        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column
+                label="序号"
+                width="35px">
+          <template slot-scope="scope">
+            {{scope.$index+1}}
+          </template>
+        </el-table-column>
         <el-table-column prop="userName" label="上报网格长" header-align="center" align="center"></el-table-column>
         <el-table-column prop="allDeptNames" label="所属机构" header-align="center" align="center"></el-table-column>
         <el-table-column prop="conflictType" label="矛盾纠纷类型" header-align="center" align="center"></el-table-column>
@@ -94,7 +105,8 @@ export default {
         getDataListURL: '/property/conflictmediate/page',
         getDataListIsPage: true,
         deleteURL: '/property/conflictmediate',
-        deleteIsBatch: true
+        deleteIsBatch: true,
+        exportURL: '/property/conflictmediate/export'
       },
       dataForm: {
         id: ''

From 7666285d286452a06811e66f05566eee9acec184 Mon Sep 17 00:00:00 2001
From: yujt <work@yujt.net.cn>
Date: Mon, 15 Jun 2020 15:44:05 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E5=BF=83=E7=90=86=E5=92=A8=E8=AF=A2?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/conflict/conflictmediate.vue      |  53 ++---
 .../psychology/psychologist-add-or-update.vue | 225 ++++++++----------
 src/views/modules/psychology/psychologist.vue |   3 +-
 ...sychologisttitlerelation-add-or-update.vue | 131 ----------
 .../psychology/psychologisttitlerelation.vue  |  73 ------
 5 files changed, 111 insertions(+), 374 deletions(-)
 delete mode 100644 src/views/modules/psychology/psychologisttitlerelation-add-or-update.vue
 delete mode 100644 src/views/modules/psychology/psychologisttitlerelation.vue

diff --git a/src/views/modules/conflict/conflictmediate.vue b/src/views/modules/conflict/conflictmediate.vue
index ad39a0b..b56b066 100644
--- a/src/views/modules/conflict/conflictmediate.vue
+++ b/src/views/modules/conflict/conflictmediate.vue
@@ -2,16 +2,10 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-__conflictmediate}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item label="社区">
-          <el-cascader
-                  :options="options"
-                  @change="handleChange"
-                  clearable>
-          </el-cascader>
-        </el-form-item>
-        <el-form-item label="网格">
+        <el-form-item label="所属机构">
           <el-cascader
                   :options="gridOptions"
+                  :props="{ checkStrictly: true }"
                   @change="handleChangeGrid"
                   clearable>
           </el-cascader>
@@ -72,12 +66,12 @@
         <el-table-column prop="remark" label="备注" header-align="center" align="center"></el-table-column>
         <el-table-column prop="submitTime" label="提报时间" header-align="center" align="center"></el-table-column>
 
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+        <!-- <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
             <el-button v-if="$hasPermission('conflict:conflictmediate:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
             <el-button v-if="$hasPermission('conflict:conflictmediate:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
-        </el-table-column>
+        </el-table-column> -->
       </el-table>
       <el-pagination
         :current-page="page"
@@ -135,42 +129,25 @@ export default {
     AddOrUpdate
   },
   mounted () {
-    // 获取下拉菜单
-    this.getByLoginUser()
     // 获取下拉菜单
     this.getGridByLoginUser()
   },
   methods: {
-    handleChange (value) {
-      this.dataForm.comm = value.slice(-1).shift()
-    },
     handleChangeGrid (value) {
-      this.dataForm.grid = value.slice(-1).shift()
-    },
-    getByLoginUser () {
-      this.$http
-              .get(`/sys/user/deptOptions/getMiddleByLoginUser`)
-              .then(({ data: res }) => {
-                if (res.code !== 0) {
-                  return this.$message.error(res.msg)
-                }
-                this.options = res.data.options
-              })
-              .catch(() => {
-              })
+      this.dataForm.deptId = value.slice(-1).shift()
     },
     getGridByLoginUser () {
       this.$http
-              .get(`/sys/user/deptOptions/getBusinessDeptByUser`)
-              .then(({ data: res }) => {
-                if (res.code !== 0) {
-                  return this.$message.error(res.msg)
-                }
-                this.gridOptions = res.data.options
-              })
-              .catch(() => {
-              })
-    },
+        .get(`/sys/user/deptOptions/getBusinessDeptByUser`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.gridOptions = res.data.options
+        })
+        .catch(() => {
+        })
+    }
   }
 }
 </script>
diff --git a/src/views/modules/psychology/psychologist-add-or-update.vue b/src/views/modules/psychology/psychologist-add-or-update.vue
index cc77a82..6d1a60e 100644
--- a/src/views/modules/psychology/psychologist-add-or-update.vue
+++ b/src/views/modules/psychology/psychologist-add-or-update.vue
@@ -1,10 +1,28 @@
 <template>
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
-          <el-form-item label="姓名" prop="name">
-          <el-input v-model="dataForm.name" placeholder="咨询师姓名"></el-input>
+      <el-form-item label="绑定用户" prop="userId" >
+        <el-select style="width: 100%" v-model="dataForm.userId" filterable remote reserve-keyword placeholder="请输入关键词"
+                    :remote-method="remoteMethod" :loading="loading"  @change="fillNameAndMobile">
+          <el-option v-for="item in options" :key="item.id" :label="item.realName" :value="item.id">
+            <span style="float: left">{{ item.realName }}</span>
+            <span style="float: right; color: #8492a6; font-size: 13px">{{ item.mobile }}</span>
+          </el-option>
+        </el-select>
       </el-form-item>
-        <el-form-item label="民警照片"
+      <el-form-item label="姓名" prop="name">
+          <el-input v-model="dataForm.name" maxlength="20" placeholder="咨询师姓名"></el-input>
+      </el-form-item>
+      <el-form-item label="联系方式" prop="mobile">
+          <el-input v-model="dataForm.mobile" maxlength="15" placeholder="咨询师联系方式"></el-input>
+      </el-form-item>
+      <el-form-item label="性别" prop="sex">
+        <el-select v-model="dataForm.sex" placeholder="性别">
+          <el-option v-for="item in sex" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="民警照片"
                       v-loading="loading"
                       prop="avatar">
             <el-upload class="avatar-uploader"
@@ -22,45 +40,12 @@
                      class="el-upload__tip">只能上传jpg/png文件，且不超过500kb
                 </div>
             </el-upload>
-        </el-form-item>
-          <el-form-item label="联系方式" prop="mobile">
-          <el-input v-model="dataForm.mobile" placeholder="咨询师联系方式"></el-input>
-      </el-form-item>
-          <el-form-item label="性别" prop="sex">
-              <el-select v-model="dataForm.sex"
-                         placeholder="性别">
-                  <el-option v-for="item in sex"
-                             :key="item.dictValue"
-                             :label="item.dictName"
-                             :value="item.dictValue">
-                  </el-option>
-              </el-select>
-      </el-form-item>
-        <el-form-item label="绑定用户" prop="userId">
-            <el-select
-                    style="width: 100%"
-                    v-model="dataForm.userId"
-                    filterable
-                    remote
-                    reserve-keyword
-                    placeholder="请输入关键词"
-                    :remote-method="remoteMethod"
-                    :loading="loading">
-                <el-option
-                        v-for="item in options"
-                        :key="item.id"
-                        :label="item.realName"
-                        :value="item.id">
-                    <span style="float: left">{{ item.realName }}</span>
-                    <span style="float: right; color: #8492a6; font-size: 13px">{{ item.mobile }}</span>
-                </el-option>
-            </el-select>
         </el-form-item>
           <el-form-item label="座右铭" prop="motto">
-          <el-input v-model="dataForm.motto" placeholder="座右铭"></el-input>
+          <el-input type="textarea" maxlength="100" show-word-limit v-model="dataForm.motto" placeholder="座右铭"></el-input>
       </el-form-item>
           <el-form-item label="简介" prop="briefIntroduction">
-          <el-input v-model="dataForm.briefIntroduction" placeholder="简介"></el-input>
+          <el-input type="textarea" maxlength="500" show-word-limit :rows="4" v-model="dataForm.briefIntroduction" placeholder="简介"></el-input>
       </el-form-item>
         <el-form-item label="头衔" prop="titles">
             <el-select
@@ -79,9 +64,9 @@
                 </el-option>
             </el-select>
         </el-form-item>
-          <el-form-item label="排序" prop="sort">
-          <el-input v-model="dataForm.sort" type="number" placeholder="排序 从小到大"></el-input>
-      </el-form-item>
+        <el-form-item label="排序" prop="sort">
+          <el-input-number v-model="dataForm.sort" controls-position="right" :min="0" :label="$t('dict.sort')"  placeholder="排序 从小到大"></el-input-number>
+        </el-form-item>
       </el-form>
     <template slot="footer">
       <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
@@ -92,7 +77,7 @@
 
 <script>
 import debounce from 'lodash/debounce'
-import Cookies from "js-cookie";
+import Cookies from 'js-cookie'
 export default {
   data () {
     return {
@@ -107,36 +92,29 @@ export default {
         motto: '',
         briefIntroduction: '',
         sort: '',
-        displayFlag: '',
-        delFlag: '',
-        revision: '',
-        createdBy: '',
-        createdTime: '',
-        updatedBy: '',
-        updatedTime: '',
-          titles: [],
+        titles: []
       },
-        loading: false,
-        uploadUrl: '',
-        options: [],
-        titles: [],
-        sex: [
-            { dictValue: '1', dictName: '男' },
-            { dictValue: '0', dictName: '女' }
-        ]
+      loading: false,
+      uploadUrl: '',
+      options: [],
+      titles: [],
+      sex: [
+        { dictValue: '1', dictName: '男' },
+        { dictValue: '0', dictName: '女' }
+      ]
     }
   },
-    created () {
-        this.$nextTick(() => {
-            this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/oss/file/upload?token=${Cookies.get('token')}`
-        });
-    },
-    mounted() {
-      this.options=[];
-      this.titles=[];
-        this.getUser('');
-        this.getTitle();
-    },
+  created () {
+    this.$nextTick(() => {
+      this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/oss/file/upload?token=${Cookies.get('token')}`
+    })
+  },
+  mounted () {
+    this.options = []
+    this.titles = []
+    this.getUser('')
+    this.getTitle()
+  },
   computed: {
     dataRule () {
       return {
@@ -164,25 +142,7 @@ export default {
         sort: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
-        displayFlag: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        delFlag: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        revision: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        createdBy: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        createdTime: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        updatedBy: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        updatedTime: [
+        titles: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ]
       }
@@ -210,50 +170,53 @@ export default {
         }
       }).catch(() => {})
     },
-      getUser (userInfo) {
-          let postData = { roleId: 'psychologist', userInfo: userInfo };
+    getUser (userInfo) {
+      let postData = { roleId: 'psychologist', userInfo: userInfo }
 
-          this.$http.get(`/sys/user/getRoleMembers`, { params: postData}).then(({ data: res }) => {
-              if (res.code !== 0) {
-                  return this.$message.error(res.msg)
-              }
-              this.options={
-                  ...res.data
-              };
-          }).catch(() => {})
-      },
-      getTitle () {
-          let postData = { delFlag: '0' };
-          this.$http.get(`/property/psychologisttitle/list`, { params: postData}).then(({ data: res }) => {
-              if (res.code !== 0) {
-                  return this.$message.error(res.msg)
-              }
-              this.titles={
-                  ...res.data
-              };
-          }).catch(() => {})
-      },
-      remoteMethod(query) {
-          if (query !== '') {
-              this.loading = true;
-              setTimeout(() => {
-                  this.loading = false;
-                  this.getUser(query);
-              }, 200);
-          } else {
-              this.options = [];
-          }
-      },
-      handleAvatarActSuccess (res, file) {
-          this.loading = false
-          this.dataForm.avatar = res.data.url
-      },
-      beforeAvatarUpload (file) {
-          this.loading = true
-      },
-      handelError () {
+      this.$http.get(`/sys/user/getRoleMembers`, { params: postData }).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.options = res.data
+      }).catch(() => {})
+    },
+    getTitle () {
+      let postData = { delFlag: '0' }
+      this.$http.get(`/property/psychologisttitle/list`, { params: postData }).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.titles = {
+          ...res.data
+        }
+      }).catch(() => {})
+    },
+    remoteMethod (query) {
+      if (query !== '') {
+        this.loading = true
+        setTimeout(() => {
           this.loading = false
-      },
+          this.getUser(query)
+        }, 200)
+      } else {
+        this.options = []
+      }
+    },
+    handleAvatarActSuccess (res, file) {
+      this.loading = false
+      this.dataForm.avatar = res.data.url
+    },
+    beforeAvatarUpload (file) {
+      this.loading = true
+    },
+    handelError () {
+      this.loading = false
+    },
+    fillNameAndMobile (val) {
+      let adminuser = this.options.filter(item => item.id === val)[0]
+      this.dataForm.name = adminuser.realName
+      this.dataForm.mobile = adminuser.mobile
+    },
     // 表单提交
     dataFormSubmitHandle: debounce(function () {
       this.$refs['dataForm'].validate((valid) => {
@@ -306,4 +269,4 @@ export default {
         height: 178px;
         display: block;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/modules/psychology/psychologist.vue b/src/views/modules/psychology/psychologist.vue
index 3d49fe7..0ba8123 100644
--- a/src/views/modules/psychology/psychologist.vue
+++ b/src/views/modules/psychology/psychologist.vue
@@ -50,6 +50,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="motto" label="座右铭" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="briefIntroduction" label="简介" header-align="center" align="center"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
             <el-button v-if="$hasPermission('psychology:psychologist:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
@@ -100,4 +101,4 @@ export default {
     width: 200px !important;
     height: 200px !important;;
   }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/modules/psychology/psychologisttitlerelation-add-or-update.vue b/src/views/modules/psychology/psychologisttitlerelation-add-or-update.vue
deleted file mode 100644
index 4d4d9cc..0000000
--- a/src/views/modules/psychology/psychologisttitlerelation-add-or-update.vue
+++ /dev/null
@@ -1,131 +0,0 @@
-<template>
-  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
-          <el-form-item label="头衔id" prop="titleId">
-          <el-input v-model="dataForm.titleId" placeholder="头衔id"></el-input>
-      </el-form-item>
-          <el-form-item label="咨询师id" prop="psychologistId">
-          <el-input v-model="dataForm.psychologistId" placeholder="咨询师id"></el-input>
-      </el-form-item>
-          <el-form-item label="删除标记 0：未删除，1：已删除" prop="delFlag">
-          <el-input v-model="dataForm.delFlag" placeholder="删除标记 0：未删除，1：已删除"></el-input>
-      </el-form-item>
-          <el-form-item label="乐观锁" prop="revision">
-          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
-      </el-form-item>
-          <el-form-item label="创建人" prop="createdBy">
-          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
-      </el-form-item>
-          <el-form-item label="创建时间" prop="createdTime">
-          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
-      </el-form-item>
-          <el-form-item label="更新人" prop="updatedBy">
-          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
-      </el-form-item>
-          <el-form-item label="更新时间" prop="updatedTime">
-          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
-      </el-form-item>
-      </el-form>
-    <template slot="footer">
-      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
-      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
-    </template>
-  </el-dialog>
-</template>
-
-<script>
-import debounce from 'lodash/debounce'
-export default {
-  data () {
-    return {
-      visible: false,
-      dataForm: {
-        id: '',
-        titleId: '',
-        psychologistId: '',
-        delFlag: '',
-        revision: '',
-        createdBy: '',
-        createdTime: '',
-        updatedBy: '',
-        updatedTime: ''
-      }
-    }
-  },
-  computed: {
-    dataRule () {
-      return {
-        titleId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        psychologistId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        delFlag: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        revision: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        createdBy: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        createdTime: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        updatedBy: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        updatedTime: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  methods: {
-    init () {
-      this.visible = true
-      this.$nextTick(() => {
-        this.$refs['dataForm'].resetFields()
-        if (this.dataForm.id) {
-          this.getInfo()
-        }
-      })
-    },
-    // 获取信息
-    getInfo () {
-      this.$http.get(`//psychologisttitlerelation/${this.dataForm.id}`).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.dataForm = {
-          ...this.dataForm,
-          ...res.data
-        }
-      }).catch(() => {})
-    },
-    // 表单提交
-    dataFormSubmitHandle: debounce(function () {
-      this.$refs['dataForm'].validate((valid) => {
-        if (!valid) {
-          return false
-        }
-        this.$http[!this.dataForm.id ? 'post' : 'put']('//psychologisttitlerelation/', this.dataForm).then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          }
-          this.$message({
-            message: this.$t('prompt.success'),
-            type: 'success',
-            duration: 500,
-            onClose: () => {
-              this.visible = false
-              this.$emit('refreshDataList')
-            }
-          })
-        }).catch(() => {})
-      })
-    }, 1000, { 'leading': true, 'trailing': false })
-  }
-}
-</script>
diff --git a/src/views/modules/psychology/psychologisttitlerelation.vue b/src/views/modules/psychology/psychologisttitlerelation.vue
deleted file mode 100644
index 035c398..0000000
--- a/src/views/modules/psychology/psychologisttitlerelation.vue
+++ /dev/null
@@ -1,73 +0,0 @@
-<template>
-  <el-card shadow="never" class="aui-card--fill">
-    <div class="mod-__psychologisttitlerelation}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item>
-          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission(':psychologisttitlerelation:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission(':psychologisttitlerelation:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
-        </el-form-item>
-      </el-form>
-      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
-        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="id" label="主键" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="titleId" label="头衔id" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="psychologistId" label="咨询师id" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="delFlag" label="删除标记 0：未删除，1：已删除" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="revision" label="乐观锁" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdBy" label="创建人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updatedBy" label="更新人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updatedTime" label="更新时间" header-align="center" align="center"></el-table-column>
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
-          <template slot-scope="scope">
-            <el-button v-if="$hasPermission(':psychologisttitlerelation:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission(':psychologisttitlerelation:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-pagination
-        :current-page="page"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="limit"
-        :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="pageSizeChangeHandle"
-        @current-change="pageCurrentChangeHandle">
-      </el-pagination>
-      <!-- 弹窗, 新增 / 修改 -->
-      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
-    </div>
-  </el-card>
-</template>
-
-<script>
-import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './psychologisttitlerelation-add-or-update'
-export default {
-  mixins: [mixinViewModule],
-  data () {
-    return {
-      mixinViewModuleOptions: {
-        getDataListURL: '//psychologisttitlerelation/page',
-        getDataListIsPage: true,
-        deleteURL: '//psychologisttitlerelation',
-        deleteIsBatch: true
-      },
-      dataForm: {
-        id: ''
-      }
-    }
-  },
-  components: {
-    AddOrUpdate
-  }
-}
-</script>