提交

ruoyi-ui/src/views/system/image/index.vue

@@ -0,0 +1,328 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="附件名称" prop="imageName">
+        <el-input
+          v-model="queryParams.imageName"
+          placeholder="请输入附件名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="附件简介" prop="imageIntroduce">
+        <el-input
+          v-model="queryParams.imageIntroduce"
+          placeholder="请输入附件简介"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="附件类型" prop="type">
+        <el-select v-model="queryParams.type" placeholder="请选择附件类型" clearable size="small">
+          <el-option
+            v-for="dict in dict.type.image_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="是否删除" prop="isDel">
+        <el-input
+          v-model="queryParams.isDel"
+          placeholder="请输入是否删除"
+          clearable
+          size="small"
+          @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="['system:image: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="['system:image: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="['system:image: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="['system:image:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="imageList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="附件ID" align="center" prop="imageId" />
+      <el-table-column label="附件名称" align="center" prop="imageName" />
+      <el-table-column label="附件内容" align="center" prop="imageContent" />
+      <el-table-column label="附件简介" align="center" prop="imageIntroduce" />
+      <el-table-column label="附件状态" align="center" prop="status" />
+      <el-table-column label="附件类型" align="center" prop="type">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.image_type" :value="scope.row.type"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="是否删除" align="center" prop="isDel">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.is_del" :value="scope.row.isDel"/>
+        </template>
+      </el-table-column>
+      <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
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:image:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:image: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="附件名称" prop="imageName">
+          <el-input v-model="form.imageName" placeholder="请输入附件名称" />
+        </el-form-item>
+        <el-form-item label="附件内容">
+          <fileUpload v-model="form.imageContent"/>
+        </el-form-item>
+        <el-form-item label="附件简介" prop="imageIntroduce">
+          <el-input v-model="form.imageIntroduce" placeholder="请输入附件简介" />
+        </el-form-item>
+        <el-form-item label="附件类型" prop="type">
+          <el-select v-model="form.type" placeholder="请选择附件类型">
+            <el-option
+              v-for="dict in dict.type.image_type"
+              :key="dict.value"
+              :label="dict.label"
+:value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="是否删除" prop="isDel">
+          <el-input v-model="form.isDel" placeholder="请输入是否删除" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listImage, getImage, delImage, addImage, updateImage } from "@/api/system/image";
+
+export default {
+  name: "Image",
+  dicts: ['image_type'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 附件信息表格数据
+      imageList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        imageName: null,
+        imageIntroduce: null,
+        status: null,
+        type: null,
+        isDel: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        imageName: [
+          { required: true, message: "附件名称不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询附件信息列表 */
+    getList() {
+      this.loading = true;
+      listImage(this.queryParams).then(response => {
+        this.imageList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        imageId: null,
+        imageName: null,
+        imageContent: null,
+        imageIntroduce: null,
+        status: null,
+        type: null,
+        isDel: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        remark: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.imageId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加附件信息";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const imageId = row.imageId || this.ids
+      getImage(imageId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改附件信息";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.imageId != null) {
+            updateImage(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addImage(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const imageIds = row.imageId || this.ids;
+      this.$modal.confirm('是否确认删除附件信息编号为"' + imageIds + '"的数据项？').then(function() {
+        return delImage(imageIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('system/image/export', {
+        ...this.queryParams
+      }, `image_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

ruoyi-ui/src/views/system/news/index.vue

@@ -323,24 +323,45 @@ export default {
     /** 驳回按钮操作 */
     reject(row) {
       const newsId = row.newsId || this.ids
+	  var that = this
       this.$prompt('请输入驳回原因', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
+		inputValue: '',
+		inputErrorMessage: '输入不能为空',
+		showCancelButton:false,
+		inputValidator: (value) => {       // 点击按钮时，对文本框里面的值进行验证
+		                        if(!value) {
+		                            return '输入不能为空';
+		                        }
+				},
+
       }).then(({ value }) => {
+		  console.log(234)
         this.boh.reason = value
         this.boh.newsId = newsId
-        this.rejectNews(this.boh).then(response => {
-          this.$modal.msgSuccess("驳回成功");
-          this.open = false;
-          this.getList();
-        });
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '取消输入'
-        });
+		// that.rejectNews(this.boh).then(response => {
+		// 	console.log(8764)
+		//   this.$modal.msgSuccess("驳回成功");
+		//   // this.open = false;
+		//   this.getList();
+		// });
+        return  that.nhde()
+      })
+	  .catch(() => {
+		  // this.nhde()
+		  console.log(12434)
       });
     },
+	nhde(){
+		console.log(3456)
+		rejectNews(this.boh).then(response => {
+			console.log(8764)
+		  this.$modal.msgSuccess("驳回成功");
+		  // this.open = false;
+		  this.getList();
+		});
+	},
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {