init

src/api/xq/dynamic.js

@@ -42,3 +42,21 @@ export function delDynamic(id) {
     method: 'delete'
   })
 }
+
+
+export function dynamicAuditSuccess(data) {
+  return request({
+    url: '/xq/dynamic/audit/success',
+    method: 'post',
+    data: data
+  })
+}
+
+
+export function dynamicAuditFail(data) {
+  return request({
+    url: '/xq/dynamic/audit/fail',
+    method: 'post',
+    data: data
+  })
+}

src/api/xq/userInfoAudit.js

@@ -17,20 +17,19 @@ export function getUserInfoAudit(id) {
   })
 }
 
-// 新增用户信息审核
+export function userInfoAuditSuccess(data) {
-export function addUserInfoAudit(data) {
   return request({
-    url: '/xq/userInfoAudit',
+    url: '/xq/userInfoAudit/audit/success',
     method: 'post',
     data: data
   })
 }
 
-// 修改用户信息审核
+
-export function updateUserInfoAudit(data) {
+export function userInfoAuditFail(data) {
   return request({
-    url: '/xq/userInfoAudit',
+    url: '/xq/userInfoAudit/audit/fail',
-    method: 'put',
+    method: 'post',
     data: data
   })
 }

src/constant/statusMap.js

@@ -528,3 +528,9 @@ export const enableStatusList = [
   { value: 1, label: '正常',listClass: listClass.primary},
   { value: 0, label: '禁用',listClass: listClass.danger},
 ]
+
+// 1-头像 1-自我描述
+export const userInfoAuditTypeList = [
+  { value: 1, label: '头像',listClass: listClass.primary},
+  { value: 2, label: '自我描述',listClass: listClass.primary},
+]

src/views/xq/dynamic/index.vue

@@ -1,90 +1,26 @@
 <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-form-item label="用户编号" prop="usercode">
-        <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="请输入用户号"
+          placeholder="请输入用户编号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="城市ID" prop="cityId">
+      <el-form-item label="昵称" prop="nickname">
         <el-input
-          v-model="queryParams.cityId"
+          v-model="queryParams.nickname"
-          placeholder="请输入城市ID"
+          placeholder="请输入昵称"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="城市" prop="city">
+      <el-form-item label="手机号" prop="mobile">
         <el-input
-          v-model="queryParams.city"
+          v-model="queryParams.mobile"
-          placeholder="请输入城市"
+          placeholder="请输入手机号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="是否有附件  0 没有  1  有" prop="isAttach">
-        <el-input
-          v-model="queryParams.isAttach"
-          placeholder="请输入是否有附件  0 没有  1  有"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="审核备注" prop="auditRemark">
-        <el-input
-          v-model="queryParams.auditRemark"
-          placeholder="请输入审核备注"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="审核时间" prop="auditTime">
-        <el-date-picker clearable
-          v-model="queryParams.auditTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择审核时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="审核人ID" prop="auditOpId">
-        <el-input
-          v-model="queryParams.auditOpId"
-          placeholder="请输入审核人ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="审核人名称" prop="auditOpName">
-        <el-input
-          v-model="queryParams.auditOpName"
-          placeholder="请输入审核人名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="审核人IP" prop="auditIp">
-        <el-date-picker clearable
-          v-model="queryParams.auditIp"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择审核人IP">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="排序字段" prop="sort">
-        <el-input
-          v-model="queryParams.sort"
-          placeholder="请输入排序字段"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -96,27 +32,6 @@
     </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:dynamic: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:dynamic:edit']"
-        >修改</el-button>
-      </el-col>
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -130,50 +45,63 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="warning"
+          type="success"
           plain
-          icon="el-icon-download"
+          icon="el-icon-edit"
           size="mini"
-          @click="handleExport"
+          :disabled="multiple"
-          v-hasPermi="['xq:dynamic:export']"
+          @click="handleAuditSuccess"
-        >导出</el-button>
+          v-hasPermi="['xq:dynamic:edit']"
+        >批量审核通过
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="dynamicList" @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="用户编号" align="center" prop="usercode"/>
-      <el-table-column label="用户ID" align="center" prop="userId" />
+      <el-table-column label="昵称" align="center" prop="nickname" show-overflow-tooltip/>
-      <el-table-column label="用户号" align="center" prop="usercode" />
+      <el-table-column label="手机号" align="center" prop="mobile" width="100"/>
+      <el-table-column label="头像" align="center" prop="avatar">
+        <template v-slot="scope">
+          <image-avatar :src="scope.row.avatar"/>
+        </template>
+      </el-table-column>
       <el-table-column label="内容" align="center" prop="content" />
-      <el-table-column label="城市ID" align="center" prop="cityId" />
+      <el-table-column label="图片" align="center" prop="imageList" >
-      <el-table-column label="城市" align="center" prop="city" />
+        <template v-slot="scope">
-      <el-table-column label="是否有附件  0 没有  1  有" align="center" prop="isAttach" />
+           <span v-for='val in scope.row.imageList'>
-      <el-table-column label="1-待审核 2-审核成功 3-审核失败" align="center" prop="auditStatus" />
+              <image-preview :src="val" height="40px" width="40px"  /> &nbsp;
-      <el-table-column label="审核备注" align="center" prop="auditRemark" />
+            </span>
-      <el-table-column label="审核时间" align="center" prop="auditTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.auditTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="审核人ID" align="center" prop="auditOpId" />
+      <el-table-column label="状态" align="center" prop="auditStatus">
-      <el-table-column label="审核人名称" align="center" prop="auditOpName" />
+        <template v-slot="scope">
-      <el-table-column label="审核人IP" align="center" prop="auditIp" width="180">
+          <cai-dict-tag :options="auditStatusList" :value="scope.row.auditStatus"/>
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.auditIp, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="排序字段" align="center" prop="sort" />
+      <el-table-column label="审核备注" align="center" prop="auditRemark"/>
+      <el-table-column label="审核时间" align="center" prop="auditTime" width="180"/>
+      <el-table-column label="审核人" align="center" prop="auditOpName"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            @click="handleAuditSuccess(scope.row)"
-            @click="handleUpdate(scope.row)"
+            v-if="scope.row.auditStatus === 1"
             v-hasPermi="['xq:dynamic:edit']"
-          >修改</el-button>
+          >通过
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            v-if="scope.row.auditStatus === 1"
+            @click="handleAuditFail(scope.row)"
+            v-hasPermi="['xq:dynamic:edit']"
+          >不通过
+          </el-button>
           <el-button
             size="mini"
             type="text"
@@ -192,74 +120,18 @@
       :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="内容">
-          <editor v-model="form.content" :min-height="192"/>
-        </el-form-item>
-        <el-form-item label="城市ID" prop="cityId">
-          <el-input v-model="form.cityId" placeholder="请输入城市ID" />
-        </el-form-item>
-        <el-form-item label="城市" prop="city">
-          <el-input v-model="form.city" placeholder="请输入城市" />
-        </el-form-item>
-        <el-form-item label="是否有附件  0 没有  1  有" prop="isAttach">
-          <el-input v-model="form.isAttach" placeholder="请输入是否有附件  0 没有  1  有" />
-        </el-form-item>
-        <el-form-item label="审核备注" prop="auditRemark">
-          <el-input v-model="form.auditRemark" placeholder="请输入审核备注" />
-        </el-form-item>
-        <el-form-item label="审核时间" prop="auditTime">
-          <el-date-picker clearable
-            v-model="form.auditTime"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="请选择审核时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="审核人ID" prop="auditOpId">
-          <el-input v-model="form.auditOpId" placeholder="请输入审核人ID" />
-        </el-form-item>
-        <el-form-item label="审核人名称" prop="auditOpName">
-          <el-input v-model="form.auditOpName" placeholder="请输入审核人名称" />
-        </el-form-item>
-        <el-form-item label="审核人IP" prop="auditIp">
-          <el-date-picker clearable
-            v-model="form.auditIp"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="请选择审核人IP">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="排序字段" prop="sort">
-          <el-input v-model="form.sort" 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 { listDynamic, getDynamic, delDynamic, addDynamic, updateDynamic } from "@/api/xq/dynamic";
+import { delDynamic, dynamicAuditFail, dynamicAuditSuccess, listDynamic } from '@/api/xq/dynamic'
+import { auditStatusList } from '@/constant/statusMap'
 
 export default {
   name: "Dynamic",
   data() {
     return {
-      // 按钮loading
+      auditStatusList,
-      buttonLoading: false,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -274,75 +146,15 @@ export default {
       total: 0,
       // 动态审核表格数据
       dynamicList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        userId: undefined,
         usercode: undefined,
-        content: undefined,
+        nickname: undefined,
-        cityId: undefined,
-        city: undefined,
-        isAttach: undefined,
         auditStatus: undefined,
-        auditRemark: undefined,
+        mobile: undefined
-        auditTime: undefined,
-        auditOpId: undefined,
-        auditOpName: undefined,
-        auditIp: undefined,
-        sort: undefined
       },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        id: [
-          { required: true, message: "不能为空", trigger: "blur" }
-        ],
-        userId: [
-          { required: true, message: "用户ID不能为空", trigger: "blur" }
-        ],
-        usercode: [
-          { required: true, message: "用户号不能为空", trigger: "blur" }
-        ],
-        content: [
-          { required: true, message: "内容不能为空", trigger: "blur" }
-        ],
-        cityId: [
-          { required: true, message: "城市ID不能为空", trigger: "blur" }
-        ],
-        city: [
-          { required: true, message: "城市不能为空", trigger: "blur" }
-        ],
-        isAttach: [
-          { required: true, message: "是否有附件  0 没有  1  有不能为空", trigger: "blur" }
-        ],
-        auditStatus: [
-          { required: true, message: "1-待审核 2-审核成功 3-审核失败不能为空", trigger: "change" }
-        ],
-        auditRemark: [
-          { required: true, message: "审核备注不能为空", trigger: "blur" }
-        ],
-        auditTime: [
-          { required: true, message: "审核时间不能为空", trigger: "blur" }
-        ],
-        auditOpId: [
-          { required: true, message: "审核人ID不能为空", trigger: "blur" }
-        ],
-        auditOpName: [
-          { required: true, message: "审核人名称不能为空", trigger: "blur" }
-        ],
-        auditIp: [
-          { required: true, message: "审核人IP不能为空", trigger: "blur" }
-        ],
-        sort: [
-          { required: true, message: "排序字段不能为空", trigger: "blur" }
-        ]
-      }
     };
   },
   created() {
@@ -358,32 +170,6 @@ export default {
         this.loading = false;
       });
     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: undefined,
-        userId: undefined,
-        usercode: undefined,
-        content: undefined,
-        cityId: undefined,
-        city: undefined,
-        isAttach: undefined,
-        auditStatus: undefined,
-        auditRemark: undefined,
-        auditTime: undefined,
-        auditOpId: undefined,
-        auditOpName: undefined,
-        auditIp: undefined,
-        createTime: undefined,
-        sort: undefined
-      };
-      this.resetForm("form");
-    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -400,53 +186,46 @@ export default {
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
-    /** 新增按钮操作 */
+    handleAuditSuccess(row){
-    handleAdd() {
+      const ids = row.id || this.ids.join(',')
-      this.reset();
+      this.$modal.confirm('是否确认审核通过改数据项？').then(() => {
-      this.open = true;
+        this.loading = true
-      this.title = "添加动态审核";
+        return dynamicAuditSuccess({ 'ids': ids })
-    },
+      }).then(() => {
-    /** 修改按钮操作 */
+        this.loading = false
-    handleUpdate(row) {
+        this.getList()
-      this.loading = true;
+        this.$modal.msgSuccess('操作成功')
-      this.reset();
+      }).catch(() => {
-      const id = row.id || this.ids
-      getDynamic(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) {
-            updateDynamic(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
       }).finally(() => {
-              this.buttonLoading = false;
+        this.loading = false
-            });
+      })
-          } else {
+    },
-            addDynamic(this.form).then(response => {
+    handleAuditFail(row){
-              this.$modal.msgSuccess("新增成功");
+      this.$prompt('请输入失败原因', '提示', {
-              this.open = false;
+        confirmButtonText: '确定',
-              this.getList();
+        cancelButtonText: '取消',
+        inputPattern: /^.+$/,
+        inputErrorMessage: '失败原因必填',
+        inputType: 'textarea'
+      }).then(({ value }) => {
+        this.loading = true
+        return dynamicAuditFail({
+          'auditRemark': value,
+          'id': row.id
+        })
+      }).then(() => {
+        this.loading = false
+        this.getList()
+        this.$modal.msgSuccess('审核成功')
+      }).catch(() => {
       }).finally(() => {
-              this.buttonLoading = false;
+        this.loading = false
-            });
+      })
-          }
-        }
-      });
     },
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除动态审核编号为"' + ids + '"的数据项？').then(() => {
+      this.$modal.confirm('是否确认删除动态？').then(() => {
         this.loading = true;
         return delDynamic(ids);
       }).then(() => {
@@ -457,12 +236,6 @@ export default {
       }).finally(() => {
         this.loading = false;
       });
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('xq/dynamic/export', {
-        ...this.queryParams
-      }, `dynamic_${new Date().getTime()}.xlsx`)
     }
   }
 };

src/views/xq/userInfoAudit/index.vue

@@ -1,62 +1,30 @@
 <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-form-item label="用户编号" prop="usercode">
-        <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="请输入用户号"
+          placeholder="请输入用户编号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="审核备注" prop="auditRemark">
+      <el-form-item label="昵称" prop="nickname">
         <el-input
-          v-model="queryParams.auditRemark"
+          v-model="queryParams.nickname"
-          placeholder="请输入审核备注"
+          placeholder="请输入昵称"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="审核时间" prop="auditTime">
+      <el-form-item label="手机号" prop="mobile">
-        <el-date-picker clearable
-          v-model="queryParams.auditTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择审核时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="审核人ID" prop="auditOpId">
         <el-input
-          v-model="queryParams.auditOpId"
+          v-model="queryParams.mobile"
-          placeholder="请输入审核人ID"
+          placeholder="请输入手机号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="审核人名称" prop="auditOpName">
-        <el-input
-          v-model="queryParams.auditOpName"
-          placeholder="请输入审核人名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="审核人IP" prop="auditIp">
-        <el-date-picker clearable
-          v-model="queryParams.auditIp"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择审核人IP">
-        </el-date-picker>
-      </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>
@@ -64,27 +32,6 @@
     </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:userInfoAudit: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:userInfoAudit:edit']"
-        >修改</el-button>
-      </el-col>
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -94,57 +41,80 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['xq:userInfoAudit:remove']"
-        >删除</el-button>
+        >删除
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="warning"
+          type="success"
           plain
-          icon="el-icon-download"
+          icon="el-icon-edit"
           size="mini"
-          @click="handleExport"
+          :disabled="multiple"
-          v-hasPermi="['xq:userInfoAudit:export']"
+          @click="handleAuditSuccess"
-        >导出</el-button>
+          v-hasPermi="['xq:userInfoAudit:edit']"
+        >批量审核通过
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="userInfoAuditList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="" align="center" prop="id" v-if="true"/>
+      <el-table-column label="用户编号" align="center" prop="usercode"/>
-      <el-table-column label="用户ID" align="center" prop="userId" />
+      <el-table-column label="昵称" align="center" prop="nickname" show-overflow-tooltip/>
-      <el-table-column label="用户号" align="center" prop="usercode" />
+      <el-table-column label="手机号" align="center" prop="mobile" width="100"/>
-      <el-table-column label="1-头像 1-自我描述" align="center" prop="infoType" />
+      <el-table-column label="头像" align="center" prop="avatar">
-      <el-table-column label="1-待审核 2-审核成功 3-审核失败" align="center" prop="auditStatus" />
+        <template v-slot="scope">
-      <el-table-column label="审核备注" align="center" prop="auditRemark" />
+          <image-avatar :src="scope.row.avatar"/>
-      <el-table-column label="审核时间" align="center" prop="auditTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.auditTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="审核人ID" align="center" prop="auditOpId" />
+      <el-table-column label="类型" align="center" prop="infoType">
-      <el-table-column label="审核人名称" align="center" prop="auditOpName" />
+        <template v-slot="scope">
-      <el-table-column label="审核人IP" align="center" prop="auditIp" width="180">
+          <cai-dict-tag :options="userInfoAuditTypeList" :value="scope.row.infoType"/>
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.auditIp, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="内容" align="center" prop="auditContent">
+        <template v-slot="scope">
+          <image-avatar :src="scope.row.auditContent" v-if="scope.row.infoType === 1"/>
+          <span v-if="scope.row.infoType === 2">{{ scope.row.auditContent }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="申请时间" align="center" prop="createTime" width="160"/>
+      <el-table-column label="状态" align="center" prop="auditStatus">
+        <template v-slot="scope">
+          <cai-dict-tag :options="auditStatusList" :value="scope.row.auditStatus"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="审核备注" align="center" prop="auditRemark"/>
+      <el-table-column label="审核时间" align="center" prop="auditTime" width="160"/>
+      <el-table-column label="审核人" align="center" prop="auditOpName"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            @click="handleAuditSuccess(scope.row)"
-            @click="handleUpdate(scope.row)"
+            v-if="scope.row.auditStatus === 1"
             v-hasPermi="['xq:userInfoAudit:edit']"
-          >修改</el-button>
+          >通过
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            v-if="scope.row.auditStatus === 1"
+            @click="handleAuditFail(scope.row)"
+            v-hasPermi="['xq:userInfoAudit:edit']"
+          >不通过
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['xq:userInfoAudit:remove']"
-          >删除</el-button>
+          >删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -156,59 +126,18 @@
       :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="auditRemark">
-          <el-input v-model="form.auditRemark" placeholder="请输入审核备注" />
-        </el-form-item>
-        <el-form-item label="审核时间" prop="auditTime">
-          <el-date-picker clearable
-            v-model="form.auditTime"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="请选择审核时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="审核人ID" prop="auditOpId">
-          <el-input v-model="form.auditOpId" placeholder="请输入审核人ID" />
-        </el-form-item>
-        <el-form-item label="审核人名称" prop="auditOpName">
-          <el-input v-model="form.auditOpName" placeholder="请输入审核人名称" />
-        </el-form-item>
-        <el-form-item label="审核人IP" prop="auditIp">
-          <el-date-picker clearable
-            v-model="form.auditIp"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="请选择审核人IP">
-          </el-date-picker>
-        </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 { listUserInfoAudit, getUserInfoAudit, delUserInfoAudit, addUserInfoAudit, updateUserInfoAudit } from "@/api/xq/userInfoAudit";
+import { delUserInfoAudit, listUserInfoAudit, userInfoAuditFail, userInfoAuditSuccess } from '@/api/xq/userInfoAudit'
+import { auditStatusList, userInfoAuditTypeList } from '@/constant/statusMap'
 
 export default {
-  name: "UserInfoAudit",
+  name: 'UserInfoAudit',
   data() {
     return {
-      // 按钮loading
+      auditStatusList, userInfoAuditTypeList,
-      buttonLoading: false,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -223,180 +152,98 @@ export default {
       total: 0,
       // 用户信息审核表格数据
       userInfoAuditList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        userId: undefined,
         usercode: undefined,
-        infoType: undefined,
+        nickname: undefined,
         auditStatus: undefined,
-        auditRemark: undefined,
+        mobile: undefined
-        auditTime: undefined,
+      }
-        auditOpId: undefined,
-        auditOpName: undefined,
-        auditIp: undefined,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        id: [
-          { required: true, message: "不能为空", trigger: "blur" }
-        ],
-        userId: [
-          { required: true, message: "用户ID不能为空", trigger: "blur" }
-        ],
-        usercode: [
-          { required: true, message: "用户号不能为空", trigger: "blur" }
-        ],
-        infoType: [
-          { required: true, message: "1-头像 1-自我描述不能为空", trigger: "change" }
-        ],
-        auditStatus: [
-          { required: true, message: "1-待审核 2-审核成功 3-审核失败不能为空", trigger: "change" }
-        ],
-        auditRemark: [
-          { required: true, message: "审核备注不能为空", trigger: "blur" }
-        ],
-        auditTime: [
-          { required: true, message: "审核时间不能为空", trigger: "blur" }
-        ],
-        auditOpId: [
-          { required: true, message: "审核人ID不能为空", trigger: "blur" }
-        ],
-        auditOpName: [
-          { required: true, message: "审核人名称不能为空", trigger: "blur" }
-        ],
-        auditIp: [
-          { required: true, message: "审核人IP不能为空", trigger: "blur" }
-        ],
-        createTime: [
-          { required: true, message: "创建时间不能为空", trigger: "blur" }
-        ],
     }
-    };
   },
   created() {
-    this.getList();
+    this.getList()
   },
   methods: {
     /** 查询用户信息审核列表 */
     getList() {
-      this.loading = true;
+      this.loading = true
       listUserInfoAudit(this.queryParams).then(response => {
-        this.userInfoAuditList = response.rows;
+        this.userInfoAuditList = response.rows
-        this.total = response.total;
+        this.total = response.total
-        this.loading = false;
+        this.loading = false
-      });
+      })
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: undefined,
-        userId: undefined,
-        usercode: undefined,
-        infoType: undefined,
-        auditStatus: undefined,
-        auditRemark: undefined,
-        auditTime: undefined,
-        auditOpId: undefined,
-        auditOpName: undefined,
-        auditIp: undefined,
-        createTime: undefined,
-        updateTime: undefined
-      };
-      this.resetForm("form");
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1;
+      this.queryParams.pageNum = 1
-      this.getList();
+      this.getList()
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
+      this.resetForm('queryForm')
-      this.handleQuery();
+      this.handleQuery()
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
-    /** 新增按钮操作 */
+    handleAuditSuccess(row){
-    handleAdd() {
+      const ids = row.id || this.ids.join(',')
-      this.reset();
+      this.$modal.confirm('是否确认审核通过用户数据审核项？').then(() => {
-      this.open = true;
+        this.loading = true
-      this.title = "添加用户信息审核";
+        console.log(ids)
-    },
+        return userInfoAuditSuccess({ 'ids': ids })
-    /** 修改按钮操作 */
+      }).then(() => {
-    handleUpdate(row) {
+        this.loading = false
-      this.loading = true;
+        this.getList()
-      this.reset();
+        this.$modal.msgSuccess('操作成功')
-      const id = row.id || this.ids
+      }).catch(() => {
-      getUserInfoAudit(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) {
-            updateUserInfoAudit(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
       }).finally(() => {
-              this.buttonLoading = false;
+        this.loading = false
-            });
+      })
-          } else {
+    },
-            addUserInfoAudit(this.form).then(response => {
+    handleAuditFail(row){
-              this.$modal.msgSuccess("新增成功");
+      this.$prompt('请输入失败原因', '提示', {
-              this.open = false;
+        confirmButtonText: '确定',
-              this.getList();
+        cancelButtonText: '取消',
+        inputPattern: /^.+$/,
+        inputErrorMessage: '失败原因必填',
+        inputType: 'textarea'
+      }).then(({ value }) => {
+        this.loading = true
+        return userInfoAuditFail({
+          'auditRemark': value,
+          'id': row.id
+        })
+      }).then(() => {
+        this.loading = false
+        this.getList()
+        this.$modal.msgSuccess('审核成功')
+      }).catch(() => {
       }).finally(() => {
-              this.buttonLoading = false;
+        this.loading = false
-            });
+      })
-          }
-        }
-      });
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const ids = row.id || this.ids;
+      const ids = row.id || this.ids
       this.$modal.confirm('是否确认删除用户信息审核编号为"' + ids + '"的数据项？').then(() => {
-        this.loading = true;
+        this.loading = true
-        return delUserInfoAudit(ids);
+        return delUserInfoAudit(ids)
       }).then(() => {
-        this.loading = false;
+        this.loading = false
-        this.getList();
+        this.getList()
-        this.$modal.msgSuccess("删除成功");
+        this.$modal.msgSuccess('删除成功')
       }).catch(() => {
       }).finally(() => {
-        this.loading = false;
+        this.loading = false
-      });
+      })
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('xq/userInfoAudit/export', {
-        ...this.queryParams
-      }, `userInfoAudit_${new Date().getTime()}.xlsx`)
     }
   }
-};
+}
 </script>

src/views/xq/userPictures/index.vue

@@ -82,7 +82,7 @@
       </el-table-column>
       <el-table-column label="相册" align="center" prop="picture">
         <template v-slot="scope">
-          <image-preview :src="scope.row.picture"/>
+          <image-preview :src="scope.row.picture" :height="40" :width="40"/>
         </template>
       </el-table-column>
       <el-table-column label="状态" align="center" prop="auditStatus">
@@ -213,11 +213,10 @@ export default {
       })
     },
     handleAuditSuccess(row){
-      const ids = row.id || this.ids
+      const ids = row.id || this.ids.join(',')
       this.$modal.confirm('是否确认审核通过用户相册管理编号为"' + ids + '"的数据项？').then(() => {
         this.loading = true
-        let idArray = ids.join(',')
+        return userPicturesAuditSuccess({ 'ids': ids })
-        return userPicturesAuditSuccess({ 'ids': idArray })
       }).then(() => {
         this.loading = false
         this.getList()