Merge remote-tracking branch 'origin/master'

linwei

2024-01-18 5635ca3bb143a0da7aafc722c96dc67e390fbc48

Merge remote-tracking branch 'origin/master'

 src/api/system/email.js

New file
@@ -0,0 +1,70 @@
import request from '@/router/axios';

export const getList = (current, size, params) => {
  return request({
    url: '/api/blade-email/email/list',
    method: 'get',
    params: {
      ...params,
      current,
      size,
    }
  })
}

export const getDetail = (id) => {
  return request({
    url: '/api/blade-email/email/detail',
    method: 'get',
    params: {
      id
    }
  })
}

export const remove = (ids) => {
  return request({
    url: '/api/blade-email/email/remove',
    method: 'post',
    params: {
      ids,
    }
  })
}

export const add = (row) => {
  return request({
    url: '/api/blade-email/email/submit',
    method: 'post',
    data: row
  })
}

export const update = (row) => {
  return request({
    url: '/api/blade-email/email/submit',
    method: 'post',
    data: row
  })
}

export const enable = (id) => {
  return request({
    url: '/api/blade-email/email/enable',
    method: 'post',
    params: {
      id
    }
  })
}

export const sendEmail = (params) => {
  return request({
    url: '/api/blade-email/email/sendEmail',
    method: 'post',
    params: {
      ...params
    }
  })
}


 src/views/system/email.vue

New file
@@ -0,0 +1,339 @@
<template>
  <basic-container>
    <avue-crud :option="option"
               :table-loading="loading"
               :data="data"
               :page.sync="page"
               :permission="permissionList"
               :before-open="beforeOpen"
               v-model="form"
               ref="crud"
               @row-update="rowUpdate"
               @row-save="rowSave"
               @row-del="rowDel"
               @search-change="searchChange"
               @search-reset="searchReset"
               @selection-change="selectionChange"
               @current-change="currentChange"
               @size-change="sizeChange"
               @refresh-change="refreshChange"
               @on-load="onLoad">
      <template slot="menuLeft">
        <el-button type="danger"
                   size="small"
                   icon="el-icon-delete"
                   plain
                   v-if="permission.email_delete"
                   @click="handleDelete">删 除
        </el-button>
      </template>

      <template slot-scope="{row, size}" slot="status">
        <el-tag :size="size" :type="row.statusName == '是' ? 'success' : 'info'">{{ row.statusName }}</el-tag>
      </template>




      <template slot-scope="{ row, size, index }" slot="menu">
        <el-button :size="size" type="text" icon="el-icon-circle-check" v-if="permission.email_enable"
                   @click.stop="handleEnable(row)">启用
        </el-button>
        <el-button :size="size" type="text" icon="el-icon-video-play" v-if="userInfo.role_name.includes('admin')"
                   @click="handleDebug(row)">调试
        </el-button>
      </template>

    </avue-crud>

    <el-dialog title="短信发送调试" append-to-body :visible.sync="box" width="550px">
      <avue-form ref="form" :option="debugOption" v-model="debugForm" @submit="handleSubmit" />
    </el-dialog>

  </basic-container>
</template>

<script>
import {getList, getDetail, add, update, remove, enable, sendEmail} from "@/api/system/email";
  import {mapGetters} from "vuex";

  export default {
    data() {
      return {
        box:false,
        form: {},
        query: {},
        loading: true,
        page: {
          pageSize: 10,
          currentPage: 1,
          total: 0
        },
        selectionList: [],
        option: {height:'auto',
          calcHeight: 30,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,
          border: true,
          index: true,
          viewBtn: true,
          selection: true,
          dialogClickModal: false,
          menuWidth: 350,
          column: [
            {
              label: "主键",
              prop: "id",
              type: "input",
              addDisplay: false,
              editDisplay: false,
              viewDisplay: false,
              hide: true,
            },
            {
              label: "发送者邮箱",
              prop: "username",
              type: "input",
            },
            {
              label: "授权码",
              prop: "password",
              type: "input",
            },
            {
              label: "服务器地址",
              prop: "host",
              type: "input",
            },
            {
              label: "端口号",
              prop: "port",
              type: "input",
              value:465
            },
            {
              label: "默认编码",
              prop: "defaultEncoding",
              type: "input",
              value:"UTF-8"
            },
            {
              label: "协议",
              prop: "protocol",
              type: "input",
              value: "smtps"
            },
            {
              label: "备注",
              prop: "remark",
              type: "input",
            },
            {
              label: "是否启用",
              prop: "status",
              type: "input",
              addDisplay: false,
              editDisplay: false,
              viewDisplay: false,
            },
          ]},
        data: [],


        debugForm: {},
        debugOption: {
          submitText: "提交",
          column: [
            {
              label: "收件人",
              prop: "emails",
              placeholder:"多个收件人请用英文逗号进行分隔",
              span: 24,
            },
            {
              label: "主题",
              prop: "subject",
              span: 24,
            },
            {
              label: "内容",
              prop: "content",
              type:"textarea",
              minRow:5,
              span: 24,
            },
          ]
        }

      };
    },
    computed: {
      ...mapGetters(["permission","userInfo"]),
      permissionList() {
        return {
          addBtn: this.vaildData(this.permission.email_add, false),
          viewBtn: this.vaildData(this.permission.email_view, false),
          delBtn: this.vaildData(this.permission.email_delete, false),
          editBtn: this.vaildData(this.permission.email_edit, false)
        };
      },
      ids() {
        let ids = [];
        this.selectionList.forEach(ele => {
          ids.push(ele.id);
        });
        return ids.join(",");
      }
    },
    methods: {
      handleSubmit (form, done) {
        console.log(form,"+++++++++")

        form.emails = form.emails.split(",")

        sendEmail(form).then(res=>{
          this.$message({
            type: "success",
            message: "发送成功!"
          });
        })
        done()
      },
      rowSave(row, done, loading) {
        add(row).then(() => {
          this.onLoad(this.page);
          this.$message({
            type: "success",
            message: "操作成功!"
          });
          done();
        }, error => {
          loading();
          window.console.log(error);
        });
      },
      rowUpdate(row, index, done, loading) {
        update(row).then(() => {
          this.onLoad(this.page);
          this.$message({
            type: "success",
            message: "操作成功!"
          });
          done();
        }, error => {
          loading();
          console.log(error);
        });
      },
      rowDel(row) {
        this.$confirm("确定将选择数据删除?", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        })
          .then(() => {
            return remove(row.id);
          })
          .then(() => {
            this.onLoad(this.page);
            this.$message({
              type: "success",
              message: "操作成功!"
            });
          });
      },
      handleDebug (row) {
        console.log(row,"++++++++++")
        this.box = true
      },
      handleEnable (row) {
        this.$confirm("是否确定启用这条配置?", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        })
          .then(() => {
            return enable(row.id)
          })
          .then(() => {
            this.onLoad(this.page)
            this.$message({
              type: "success",
              message: "操作成功!"
            })
            this.$refs.crud.toggleSelection()
          })
      },
      handleDelete() {
        if (this.selectionList.length === 0) {
          this.$message.warning("请选择至少一条数据");
          return;
        }
        this.$confirm("确定将选择数据删除?", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        })
          .then(() => {
            return remove(this.ids);
          })
          .then(() => {
            this.onLoad(this.page);
            this.$message({
              type: "success",
              message: "操作成功!"
            });
            this.$refs.crud.toggleSelection();
          });
      },
      beforeOpen(done, type) {
        if (["edit", "view"].includes(type)) {
          getDetail(this.form.id).then(res => {
            this.form = res.data.data;
          });
        }
        done();
      },
      searchReset() {
        this.query = {};
        this.onLoad(this.page);
      },
      searchChange(params, done) {
        this.query = params;
        this.page.currentPage = 1;
        this.onLoad(this.page, params);
        done();
      },
      selectionChange(list) {
        this.selectionList = list;
      },
      selectionClear() {
        this.selectionList = [];
        this.$refs.crud.toggleSelection();
      },
      currentChange(currentPage){
        this.page.currentPage = currentPage;
      },
      sizeChange(pageSize){
        this.page.pageSize = pageSize;
      },
      refreshChange() {
        this.onLoad(this.page, this.query);
      },
      onLoad(page, params = {}) {
        this.loading = true;
        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
          const data = res.data.data;
          this.page.total = data.total;
          this.data = data.records;
          this.loading = false;
          this.selectionClear();
        });
      }
    }
  };
</script>

<style>
</style>

 src/views/work/process/maintenanceFundApply/handle.vue

@@ -20,10 +20,14 @@
        </div>
        <el-row type="flex" class="row-bg">
          <el-timeline>
            <el-timeline-item :key="flow.id" :timestamp="flow.createTime" v-for="flow in flowList" placement="top">
                        <el-timeline-item :key="flow.id" :timestamp="flow.createTime" v-for="flow in flowList"
                            placement="top">
              <el-card shadow="hover">
                <p>{{flow.assigneeName}} 在 [{{flow.createTime}}] 开始处理 [{{flow.historyActivityName}}] 环节</p>
                <p v-if="flow.historyActivityDurationTime!==''">任务历时 [{{flow.historyActivityDurationTime}}]</p>
                                <p>{{ flow.assigneeName }} 在 [{{ flow.createTime }}] 开始处理 [{{ flow.historyActivityName }}]
                                    环节</p>
                                <p v-if="flow.historyActivityDurationTime !== ''">任务历时 [{{ flow.historyActivityDurationTime
                                }}]
                                </p>
                <p v-if="flow.comment!==''">批复意见: [{{flow.comment}}]</p>
                <p v-if="flow.endTime!==''">结束时间: [{{flow.endTime}}]</p>
              </el-card>
@@ -62,7 +66,7 @@
  import {
    historyFlowList,
    leaveDetail
  } from "@/api/work/process";
} from "@/api/work/process"

  import {
    getList,
@@ -70,10 +74,11 @@
    update,
    add,
    getPropertyCapitalApply
  } from "@/api/property/propertyCapitalApply";
} from "@/api/property/propertyCapitalApply"
  import {
    completeTask
  } from "@/api/work/work";
} from "@/api/work/work"
import website from '@/config/website'

  export default {
    data() {
@@ -289,6 +294,7 @@
              label: '施工方案附件',
              prop: 'constructionSchemeUrls',
              type: 'upload',
                    listType: 'picture-img',
              span: 24,
              hide: true,
              labelWidth: 140,
@@ -311,7 +317,7 @@
      }
    },
    created() {
      this.init();
        this.init()
    },
    beforeRouteUpdate(to, from, next) {
      // 在当前路由改变，但是该组件被复用时调用
@@ -319,80 +325,81 @@
      // 由于会渲染同样的 Foo 组件，因此组件实例会被复用。而这个钩子就会在这个情况下被调用
      // 可以访问组件实例 `this`
      if (to.fullPath !== from.fullPath) {
        next();
        this.init();
            next()
            this.init()
      }
    },
    methods: {
      init() {
        this.taskId = this.$route.params.taskId;
        this.processInstanceId = this.$route.params.processInstanceId;
        this.businessId = this.$route.params.businessId;
            this.taskId = this.$route.params.taskId
            this.processInstanceId = this.$route.params.processInstanceId
            this.businessId = this.$route.params.businessId
        historyFlowList(this.processInstanceId).then(res => {
          const data = res.data;
                const data = res.data
          if (data.success) {
            this.flowList = data.data;
                    this.flowList = data.data
          }
        })
        getPropertyCapitalApply(this.businessId).then(res => {
          const data = res.data;
                const data = res.data
          if (data.success) {
            this.form = data.data;
                    data.data.constructionSchemeUrls = website.minioUrl + data.data.constructionSchemeUrls
                    this.form = data.data
          }
        })
      },
      handleAgree() {
        if (!this.form.comment) {
          this.$message.warning('请先填写批复意见');
          return;
                this.$message.warning('请先填写批复意见')
                return
        }
        const params = {
          taskId: this.taskId,
          processInstanceId: this.processInstanceId,
          flag: 'ok',
          comment: this.form.comment,
        };
            }
        completeTask(params).then(res => {
          const data = res.data;
                const data = res.data
          if (data.success) {
            this.$message.success(data.msg);
            this.$router.$avueRouter.closeTag();
                    this.$message.success(data.msg)
                    this.$router.$avueRouter.closeTag()
            this.$router.push({
              path: `/work/todo`
            });
                    })
          } else {
            this.$message.error(data.msg || '提交失败');
                    this.$message.error(data.msg || '提交失败')
          }
        })
      },
      handleDisagree() {
        if (!this.form.comment) {
          this.$message.warning('请先填写批复意见');
          return;
                this.$message.warning('请先填写批复意见')
                return
        }
        const params = {
          taskId: this.taskId,
          processInstanceId: this.processInstanceId,
          comment: this.form.comment,
        };
            }
        completeTask(params).then(res => {
          const data = res.data;
                const data = res.data
          if (data.success) {
            this.$message.success(data.msg);
            this.$router.$avueRouter.closeTag();
                    this.$message.success(data.msg)
                    this.$router.$avueRouter.closeTag()
            this.$router.push({
              path: `/work/todo`
            });
                    })
          } else {
            this.$message.error(data.msg || '提交失败');
                    this.$message.error(data.msg || '提交失败')
          }
        })
      },
      handleCancel() {
        this.$router.$avueRouter.closeTag();
            this.$router.$avueRouter.closeTag()
        this.$router.push({
          path: `/work/todo`
        });
            })
      }
    }
  }