1

src/utils/index.js

@@ -14,6 +14,17 @@ export function formatDate(cellValue) {
   var seconds = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds()
   return year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds
 }
+/**
+ * 表格时间格式化
+ */
+export function formatDateDay(cellValue) {
+  if (cellValue == null || cellValue == "") return "";
+  var date = new Date(cellValue)
+  var year = date.getFullYear()
+  var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1
+  var day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate()
+  return year + '-' + month + '-' + day
+}
 
 /**
  * @param {number} time

src/views/member/apply/index.vue

@@ -1,38 +1,38 @@
 <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"
+      <el-form-item label="审核时间" prop="startEndTime">
+        <el-date-picker
+          v-model="startEndTime"
           clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="申请者昵称" prop="nickname">
-        <el-input
-          v-model="queryParams.nickname"
-          placeholder="请输入申请者昵称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="审核人id" prop="approvalUserId">
-        <el-input
-          v-model="queryParams.approvalUserId"
-          placeholder="请输入审核人id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="审核时间" prop="approvalTime">
-        <el-date-picker clearable
-          v-model="queryParams.approvalTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择审核时间">
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期">
         </el-date-picker>
       </el-form-item>
+
+      <el-form-item label="类型" prop="identityType">
+        <el-select v-model="queryParams.identityType" placeholder="请选择通告主身份类型" clearable>
+          <el-option
+            v-for="dict in dict.type.dl_identity_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="通告主" prop="nickname">
+        <el-input
+          v-model="queryParams.nickname"
+          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>
@@ -40,68 +40,26 @@
     </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="['member:apply: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="['member:apply: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="['member:apply: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="['member:apply:export']"
-        >导出</el-button>
-      </el-col>
+
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          type="warning"-->
+      <!--          plain-->
+      <!--          icon="el-icon-download"-->
+      <!--          size="mini"-->
+      <!--          @click="handleExport"-->
+      <!--          v-hasPermi="['member:apply:export']"-->
+      <!--        >导出-->
+      <!--        </el-button>-->
+      <!--      </el-col>-->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="applyList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="唯一主键" align="center" prop="id" />
-      <el-table-column label="申请者用户id" align="center" prop="userId" />
-      <el-table-column label="申请者昵称" align="center" prop="nickname" />
-      <el-table-column label="申请认证的通告主身份类型" align="center" prop="identityType" />
-      <el-table-column label="申请描述" align="center" prop="content" />
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="图片附件地址，可多个" align="center" prop="images" />
-      <el-table-column label="审核状态(数据字典：dl_approval_status)" align="center" prop="approvalStatus" />
-      <el-table-column label="审核人id" align="center" prop="approvalUserId" />
-      <el-table-column label="审核时间" align="center" prop="approvalTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.approvalTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="审核备注" align="center" prop="approvalRemark" />
+      <el-table-column label="通告主昵称" align="center" prop="nickname"/>
+      <el-table-column label="身份类型" align="center" prop="identityType"/>
+      <el-table-column label="申请描述" align="center" prop="content"/>
+      <el-table-column label="备注" align="center" prop="remark"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -110,18 +68,11 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['member:apply:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['member:apply:remove']"
-          >删除</el-button>
+          >审核
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
-
     <pagination
       v-show="total>0"
       :total="total"
@@ -129,38 +80,51 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-
     <!-- 添加或修改通告主认证申请对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="800px" 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="nickname">
-          <el-input v-model="form.nickname" placeholder="请输入申请者昵称" />
-        </el-form-item>
-        <el-form-item label="申请描述">
-          <editor v-model="form.content" :min-height="192"/>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="图片附件地址，可多个" prop="images">
-          <el-input v-model="form.images" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
+        <el-collapse v-model="activeNames">
+          <el-collapse-item title="申请信息" name="1">
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="通告主" prop="nickname">
+                  <el-input v-model="form.nickname" placeholder="请输入申请者昵称"/>
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="申请描述">
+                  <el-input type="textarea" v-model="form.content" placeholder="请输入申请描述"/>
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="备注" prop="remark">
+                  <el-input type="textarea" v-model="form.remark" placeholder="请输入内容"/>
+                </el-form-item>
+              </el-col>
+              <el-col>
+                <el-form-item label="附件" prop="images">
+                  <ImageUpload v-model="form.images"></ImageUpload>
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+          </el-collapse-item>
+        </el-collapse>
+
+
         <el-form-item label="审核人id" prop="approvalUserId">
-          <el-input v-model="form.approvalUserId" placeholder="请输入审核人id" />
+          <el-input v-model="form.approvalUserId" placeholder="请输入审核人id"/>
         </el-form-item>
         <el-form-item label="审核时间" prop="approvalTime">
           <el-date-picker clearable
-            v-model="form.approvalTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择审核时间">
+                          v-model="form.approvalTime"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择审核时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="审核备注" prop="approvalRemark">
-          <el-input v-model="form.approvalRemark" type="textarea" placeholder="请输入内容" />
+          <el-input v-model="form.approvalRemark" type="textarea" placeholder="请输入内容"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -172,10 +136,12 @@
 </template>
 
 <script>
-import { listApply, getApply, delApply, addApply, updateApply } from "@/api/member/apply";
+import {listApply, getApply, delApply, addApply, updateApply} from "@/api/member/apply";
+import {formatDateDay} from "@/utils/index";
 
 export default {
   name: "Apply",
+  dicts: ['dl_identity_type'],
   data() {
     return {
       // 遮罩层
@@ -192,6 +158,9 @@ export default {
       total: 0,
       // 通告主认证申请表格数据
       applyList: [],
+      //创建时间段
+      startEndTime: [],
+      activeNames: ['1', '2'],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -200,22 +169,13 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        userId: null,
         nickname: null,
         identityType: null,
-        content: null,
-        remark: null,
-        images: null,
-        approvalStatus: null,
-        approvalUserId: null,
-        approvalTime: null,
-        approvalRemark: null,
       },
       // 表单参数
       form: {},
       // 表单校验
-      rules: {
-      }
+      rules: {}
     };
   },
   created() {
@@ -225,6 +185,14 @@ export default {
     /** 查询通告主认证申请列表 */
     getList() {
       this.loading = true;
+      console.log(this.startEndTime, "startEndTime")
+      if (this.startEndTime.length > 0) {
+        this.queryParams.startTime = formatDateDay(this.startEndTime[0])
+        this.queryParams.endTime = formatDateDay(this.startEndTime[1])
+      } else {
+        this.queryParams.startTime = null
+        this.queryParams.endTime = null
+      }
       listApply(this.queryParams).then(response => {
         this.applyList = response.data.records;
         this.total = response.data.total;
@@ -250,11 +218,6 @@ export default {
         approvalUserId: null,
         approvalTime: null,
         approvalRemark: null,
-        creator: null,
-        createTime: null,
-        updater: null,
-        updateTime: null,
-        delFlag: null
       };
       this.resetForm("form");
     },
@@ -265,21 +228,17 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.startEndTime = []
       this.resetForm("queryForm");
       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
     },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加通告主认证申请";
-    },
+
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
@@ -287,11 +246,12 @@ export default {
       getApply(id).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改通告主认证申请";
+        this.title = "审核";
       });
     },
     /** 提交按钮 */
     submitForm() {
+      console.log(this.form,'kkkkk')
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
@@ -313,12 +273,13 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除通告主认证申请编号为"' + ids + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除通告主认证申请编号为"' + ids + '"的数据项？').then(function () {
         return delApply(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => {
+      });
     },
     /** 导出按钮操作 */
     handleExport() {