init

src/api/xq/feedback.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询留言举报列表
+export function listFeedback(query) {
+  return request({
+    url: '/xq/feedback/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询留言举报详细
+export function getFeedback(id) {
+  return request({
+    url: '/xq/feedback/' + id,
+    method: 'get'
+  })
+}
+
+// 新增留言举报
+export function addFeedback(data) {
+  return request({
+    url: '/xq/feedback',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改留言举报
+export function updateFeedback(data) {
+  return request({
+    url: '/xq/feedback',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除留言举报
+export function delFeedback(id) {
+  return request({
+    url: '/xq/feedback/' + id,
+    method: 'delete'
+  })
+}

src/components/CaiDictTag/index.vue

@@ -32,6 +32,14 @@ export default {
       default: null,
     },
     value: [Number, String, Array, Boolean],
+    splitValue: {
+      type: String,
+      default: null
+    },
+    splitValueType: {
+      type: String,
+      default: 'int'
+    },
     emptyValue: {
       type: String,
       default: ''
@@ -42,12 +50,27 @@ export default {
   computed: {
     values() {
       if (this.value !== null && typeof this.value !== 'undefined') {
-        return Array.isArray(this.value) ? this.value : [this.value];
+        if(Array.isArray(this.value)){
+          return this.value
+        }else if(typeof this.value === "string" && this.splitValue){
+          return this.stringToArray(this.value,this.splitValue,this.splitValueType)
+        }else{
+          return [this.value]
+        }
       } else {
         return [];
       }
     },
   },
+  methods: {
+    stringToArray(data,splitValue,splitValueType){
+      let split = data.split(splitValue)
+      if(splitValueType && splitValueType === 'int'){
+        return split.map(str => parseInt(str));
+      }
+      return split;
+    }
+  }
 };
 </script>
 <style scoped>

src/constant/statusMap.js

@@ -581,3 +581,18 @@ export const userStatusShowAvatarList = [
   { value: 4, label: '实名认证且VIP用户',listClass: listClass.danger},
   { value: 5, label: '不公开',listClass: listClass.info},
 ]
+
+export const userSignList = [
+  { value: 1, label: '白羊座'},
+  { value: 2, label: '金牛座'},
+  { value: 3, label: '双子座'},
+  { value: 4, label: '巨蟹座'},
+  { value: 5, label: '狮子座'},
+  { value: 6, label: '处女座'},
+  { value: 7, label: '天秤座'},
+  { value: 8, label: '天蝎座'},
+  { value: 9, label: '射手座'},
+  { value: 10, label: '摩羯座'},
+  { value: 11, label: '水瓶座'},
+  { value: 12, label: '双鱼座'},
+]

src/views/cai/user/user-info-dialog.vue

@@ -282,11 +282,4 @@ export default {
   display: flex;
   flex-wrap: wrap
 }
-
-/* .el-card {
-   min-width: 100%;
-   height: 80%;  // 高度要设置百分比才可以
-   margin-right: 20px;
-   transition: all .5s;
- }*/
 </style>

src/views/xq/feedback/index.vue

@@ -0,0 +1,336 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="用户ID" prop="userId">
+        <el-input
+          v-model="queryParams.userId"
+          placeholder="请输入用户ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="用户号" prop="usercode">
+        <el-input
+          v-model="queryParams.usercode"
+          placeholder="请输入用户号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="留言标题" prop="title">
+        <el-input
+          v-model="queryParams.title"
+          placeholder="请输入留言标题"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="留言手机" prop="feedbackMobile">
+        <el-input
+          v-model="queryParams.feedbackMobile"
+          placeholder="请输入留言手机"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['xq:feedback:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['xq:feedback:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['xq:feedback:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['xq:feedback:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="feedbackList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="" align="center" prop="id" v-if="true"/>
+      <el-table-column label="用户ID" align="center" prop="userId" />
+      <el-table-column label="用户号" align="center" prop="usercode" />
+      <el-table-column label="留言标题" align="center" prop="title" />
+      <el-table-column label="留言内容" align="center" prop="content" />
+      <el-table-column label="留言手机" align="center" prop="feedbackMobile" />
+      <el-table-column label="状态  0 未处理   1 已经处理 " align="center" prop="reportStatus" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['xq:feedback:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['xq:feedback:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改留言举报对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="用户ID" prop="userId">
+          <el-input v-model="form.userId" placeholder="请输入用户ID" />
+        </el-form-item>
+        <el-form-item label="用户号" prop="usercode">
+          <el-input v-model="form.usercode" placeholder="请输入用户号" />
+        </el-form-item>
+        <el-form-item label="留言标题" prop="title">
+          <el-input v-model="form.title" placeholder="请输入留言标题" />
+        </el-form-item>
+        <el-form-item label="留言内容">
+          <editor v-model="form.content" :min-height="192"/>
+        </el-form-item>
+        <el-form-item label="留言手机" prop="feedbackMobile">
+          <el-input v-model="form.feedbackMobile" placeholder="请输入留言手机" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listFeedback, getFeedback, delFeedback, addFeedback, updateFeedback } from "@/api/xq/feedback";
+
+export default {
+  name: "Feedback",
+  data() {
+    return {
+      // 按钮loading
+      buttonLoading: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 留言举报表格数据
+      feedbackList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        userId: undefined,
+        usercode: undefined,
+        title: undefined,
+        content: undefined,
+        feedbackMobile: undefined,
+        reportStatus: undefined,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        id: [
+          { required: true, message: "不能为空", trigger: "blur" }
+        ],
+        userId: [
+          { required: true, message: "用户ID不能为空", trigger: "blur" }
+        ],
+        usercode: [
+          { required: true, message: "用户号不能为空", trigger: "blur" }
+        ],
+        title: [
+          { required: true, message: "留言标题不能为空", trigger: "blur" }
+        ],
+        content: [
+          { required: true, message: "留言内容不能为空", trigger: "blur" }
+        ],
+        feedbackMobile: [
+          { required: true, message: "留言手机不能为空", trigger: "blur" }
+        ],
+        reportStatus: [
+          { required: true, message: "状态  0 未处理   1 已经处理 不能为空", trigger: "change" }
+        ],
+        createTime: [
+          { required: true, message: "创建时间不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询留言举报列表 */
+    getList() {
+      this.loading = true;
+      listFeedback(this.queryParams).then(response => {
+        this.feedbackList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: undefined,
+        userId: undefined,
+        usercode: undefined,
+        title: undefined,
+        content: undefined,
+        feedbackMobile: undefined,
+        reportStatus: undefined,
+        createTime: undefined,
+        updateTime: undefined
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加留言举报";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.loading = true;
+      this.reset();
+      const id = row.id || this.ids
+      getFeedback(id).then(response => {
+        this.loading = false;
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改留言举报";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.buttonLoading = true;
+          if (this.form.id != null) {
+            updateFeedback(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          } else {
+            addFeedback(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除留言举报编号为"' + ids + '"的数据项？').then(() => {
+        this.loading = true;
+        return delFeedback(ids);
+      }).then(() => {
+        this.loading = false;
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('xq/feedback/export', {
+        ...this.queryParams
+      }, `feedback_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/xq/userInfo/index.vue

@@ -32,7 +32,7 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+<!--      <el-col :span="1.5">
         <el-button
           type="success"
           plain
@@ -42,7 +42,7 @@
           @click="handleUpdate"
           v-hasPermi="['xq:userInfo:edit']"
         >修改</el-button>
-      </el-col>
+      </el-col>-->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -76,10 +76,14 @@
             <cai-dict-tag :options="userZodiacList" :value="scope.row.zodiac" empty-value="-"/>
           </template>
         </el-table-column>
-        <el-table-column label="星座" align="center" prop="sign" />
+        <el-table-column label="星座" align="center" prop="sign" >
-        <el-table-column label="居住地" align="center" prop="residence" />
+          <template v-slot="scope">
-        <el-table-column label="户籍地" align="center" prop="address" />
+            <cai-dict-tag :options="userSignList" :value="scope.row.sign" empty-value="-"/>
-        <el-table-column label="居住城市" align="center" prop="residenceCity" />
+          </template>
+        </el-table-column>
+        <el-table-column label="居住地" align="center" prop="residenceName" />
+        <el-table-column label="户籍地" align="center" prop="addressName" />
+        <el-table-column label="居住城市" align="center" prop="residenceCityName" />
         <el-table-column label="学历" align="center" prop="education" >
           <template v-slot="scope">
             <cai-dict-tag :options="userEducationList" :value="scope.row.education" empty-value="-"/>
@@ -174,14 +178,42 @@
       <el-table-column label="择偶条件" align="center" >
         <el-table-column label="年龄" align="center" prop="filterAge" />
         <el-table-column label="身高" align="center" prop="filterHeight" />
-        <el-table-column label="体型" align="center" prop="filterSomatotype" />
+        <el-table-column label="体型" align="center" prop="filterSomatotype" >
-        <el-table-column label="婚况" align="center" prop="filterMarriage" />
+          <template v-slot="scope">
-        <el-table-column label="学历" align="center" prop="filterEducation" />
+            <cai-dict-tag :options="userSomatotypeList" :value="scope.row.filterSomatotype" empty-value="-" split-value="&"/>
-        <el-table-column label="地区" align="center" prop="filterResidence" />
+          </template>
-        <el-table-column label="年收入" align="center" prop="filterAnnualIncome" />
+        </el-table-column>
-        <el-table-column label="小孩情况" align="center" prop="filterChildStatus" />
+        <el-table-column label="婚况" align="center" prop="filterMarriage" >
-        <el-table-column label="住房情况" align="center" prop="filterHousingStatus" />
+          <template v-slot="scope">
-        <el-table-column label="购车情况" align="center" prop="filterCarStatus" />
+            <cai-dict-tag :options="userMarriageList" :value="scope.row.filterMarriage" empty-value="-" split-value="&"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="学历" align="center" prop="filterEducation" >
+          <template v-slot="scope">
+            <cai-dict-tag :options="userEducationList" :value="scope.row.filterEducation" empty-value="-" split-value="&"/>
+          </template>
+        </el-table-column>
+<!--        <el-table-column label="地区" align="center" prop="filterResidenceName" />-->
+        <el-table-column label="年收入" align="center" prop="filterAnnualIncome" >
+          <template v-slot="scope">
+            <cai-dict-tag :options="userAnnualIncomeList" :value="scope.row.filterAnnualIncome" empty-value="-" split-value="&"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="小孩情况" align="center" prop="filterChildStatus" >
+          <template v-slot="scope">
+            <cai-dict-tag :options="userChildStatusList" :value="scope.row.filterChildStatus" empty-value="-" split-value="&"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="住房情况" align="center" prop="filterHousingStatus" >
+          <template v-slot="scope">
+            <cai-dict-tag :options="userHousingStatusList" :value="scope.row.filterHousingStatus" empty-value="-" split-value="&"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="购车情况" align="center" prop="filterCarStatus" >
+          <template v-slot="scope">
+            <cai-dict-tag :options="userCarStatusList" :value="scope.row.filterCarStatus" empty-value="-" split-value="&"/>
+          </template>
+        </el-table-column>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
         <template v-slot="scope">
@@ -212,7 +244,7 @@ import {
   userEducationList, userFamilyBackgroundList, userFamilyRankingList, userForPersonalsList, userHousingStatusList,
   userLiveAtParentList, userLoveAtDistanceList, userSmokeStatusList,
   userSomatotypeList, userMarriageList, userAnnualIncomeList, userZodiacList,
-  userWantChildList, userWhenMarriageList,userFindTagList
+  userWantChildList, userWhenMarriageList, userFindTagList, userSignList
 } from '@/constant/statusMap'
 
 export default {
@@ -223,7 +255,7 @@ export default {
       userEducationList, userFamilyBackgroundList, userFamilyRankingList, userForPersonalsList, userHousingStatusList,
       userLiveAtParentList, userLoveAtDistanceList, userSmokeStatusList,
       userSomatotypeList,userMarriageList,userAnnualIncomeList,userZodiacList,
-      userWantChildList, userWhenMarriageList,userFindTagList,
+      userWantChildList, userWhenMarriageList,userFindTagList,userSignList,
       // 遮罩层
       loading: true,
       // 选中数组

src/views/xq/userInfo/user-info.vue

@@ -0,0 +1,60 @@
+<template>
+  <el-dialog title="用户信息" :close-on-click-modal="false" :visible.sync="open" width="1200px" append-to-body>
+    <el-collapse-item title="基本信息" name="base">
+      <el-descriptions :contentStyle="CS" :label-style="LS " class="margin-top" :column="3" size="medium" border>
+        <el-descriptions-item label="id">
+        </el-descriptions-item>
+      </el-descriptions>
+    </el-collapse-item>
+    <el-collapse-item title="择偶条件" name="filter">
+    </el-collapse-item>
+  </el-dialog>
+</template>
+<script>
+import { getFullUser } from '@/api/cai/user'
+
+export default {
+  name: "UserInfo",
+  data() {
+    return {
+      activeName:['base','filter'],
+      CS: {
+        'text-align': 'center',  //文本居中
+        'min-width': '250px',   //最小宽度
+        'word-break': 'break-all'  //过长时自动换行
+      },
+      LS: {
+        // 'color': '#000',
+        'text-align': 'center',
+        // 'font-weight': '600',
+        'height': '40px',
+        // 'background-color': 'rgba(255, 97, 2, 0.1)',
+        'min-width': '110px',
+        'word-break': 'keep-all'
+      },
+      open:false,
+      info:{},
+      userId: this.$route.query.id,
+    };
+  },
+  created() {
+
+  },
+  methods: {
+    init(userId){
+      this.open = true;
+      this.userId = userId;
+      getFullUser(this.userId).then(response => {
+        this.info = response.data;
+      });
+    },
+  }
+};
+</script>
+<style lang="scss" scoped>
+.el-row {
+  margin-bottom: -15px;
+  display: flex;
+  flex-wrap: wrap
+}
+</style>