shikeying
2023-03-22 47d7d2c1e141d805b28c54ac8cf6d5b6f1a2610d
src/views/workflow/leave/index.vue
@@ -5,9 +5,9 @@
        <el-select v-model="queryParams.type" placeholder="请选择请假类型" clearable size="small">
          <el-option
            v-for="dict in typeOptions"
            :key="dict.dictValue"
            :label="dict.dictLabel"
            :value="dict.dictValue"
            :key="dict.dict_value"
            :label="dict.dict_label"
            :value="dict.dict_value"
          />
        </el-select>
      </el-form-item>
@@ -41,9 +41,9 @@
        <el-select v-model="queryParams.state" placeholder="请选择状态" clearable size="small">
          <el-option
            v-for="dict in stateOptions"
            :key="dict.dictValue"
            :label="dict.dictLabel"
            :value="dict.dictValue"
            :key="dict.dict_value"
            :label="dict.dict_label"
            :value="dict.dict_value"
          />
        </el-select>
      </el-form-item>
@@ -88,14 +88,14 @@
      <el-table-column label="请假类型" align="center" prop="type" :formatter="typeFormat"/>
      <el-table-column label="标题" align="center" prop="title"/>
      <el-table-column label="原因" align="center" prop="reason"/>
      <el-table-column label="开始时间" align="center" prop="leaveStartTime" width="180">
      <el-table-column label="开始时间" align="center" prop="leave_start_time" width="180">
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.leaveStartTime, '{y}-{m}-{d}') }}</span>
          <span>{{ parseTime(scope.row.leave_start_time, '{y}-{m}-{d}') }}</span>
        </template>
      </el-table-column>
      <el-table-column label="结束时间" align="center" prop="leaveEndTime" width="180">
      <el-table-column label="结束时间" align="center" prop="leave_end_time" width="180">
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.leaveEndTime, '{y}-{m}-{d}') }}</span>
          <span>{{ parseTime(scope.row.leave_end_time, '{y}-{m}-{d}') }}</span>
        </template>
      </el-table-column>
@@ -107,7 +107,7 @@
            {{stateFormat(scope.row)}}
          </div>
          <div v-else>
            {{scope.row.taskName}}
            {{scope.row.task_name}}
          </div>
        </template>
      </el-table-column>
@@ -188,12 +188,12 @@
    <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="type">
          <el-select v-model="form.type" placeholder="请选择请假类型" @change="chooseMedicine">
          <el-select v-model="form.type" placeholder="请假类型" @change="chooseMedicine">
            <el-option
              v-for="dict in typeOptions"
              :key="dict.dictValue"
              :label="dict.dictLabel"
              :value="dict.dictValue"
              :key="dict.dict_value"
              :label="dict.dict_label"
              :value="dict.dict_value"
            ></el-option>
          </el-select>
        </el-form-item>
@@ -205,7 +205,7 @@
        </el-form-item>
        <el-form-item label="开始时间" prop="leaveStartTime">
          <el-date-picker clearable size="small" style="width: 200px"
                          v-model="form.leaveStartTime"
                          v-model="form.leave_start_time"
                          type="date"
                          value-format="yyyy-MM-dd"
                          placeholder="选择开始时间">
@@ -213,7 +213,7 @@
        </el-form-item>
        <el-form-item label="结束时间" prop="leaveEndTime">
          <el-date-picker clearable size="small" style="width: 200px"
                          v-model="form.leaveEndTime"
                          v-model="form.leave_end_time"
                          type="date"
                          value-format="yyyy-MM-dd"
                          placeholder="选择结束时间">
@@ -235,6 +235,7 @@
  import leaveHistoryForm from "./leaveHistoryForm";
  import {getToken} from "@/utils/auth";
  export default {
    name: 'Leave',
@@ -297,10 +298,10 @@
          reason: [
            {required: true, message: '原因不能为空', trigger: 'blur'}
          ],
          leaveStartTime: [
          leave_start_time: [
            {required: true, message: '开始时间不能为空', trigger: 'blur'}
          ],
          leaveEndTime: [
          leave_end_time: [
            {required: true, message: '结束时间不能为空', trigger: 'blur'}
          ]
        }
@@ -320,7 +321,7 @@
      getList() {
        this.loading = true
        listLeave(this.queryParams).then(response => {
          this.leaveList = response.rows
          this.leaveList = response.data
          this.total = response.total
          this.loading = false
        })
@@ -346,13 +347,13 @@
          type: null,
          title: null,
          reason: null,
          leaveStartTime: null,
          leaveEndTime: null,
          instanceId: null,
          leave_start_time: null,
          leave_end_time: null,
          instance_id: null,
          state: null,
          createBy: null,
          createTime: null,
          updateTime: null
          create_by: null,
          create_time: null,
          update_time: null
        }
        this.resetForm('form')
      },
@@ -374,7 +375,7 @@
      },
      /** 新增按钮操作 */
      handleAdd() {
        this.createName = this.$store.getters.nickName
        this.createName = this.$store.getters.nick_name
        if (this.$store.getters.name != "admin") {
          this.reset()
          this.open = true
@@ -404,14 +405,13 @@
      },
      /** 进度查看 */
      checkTheSchedule(row) {
        getDefinitionsByInstanceId(row.instanceId).then(response => {
          let data = response.data
        getDefinitionsByInstanceId(row.instance_id).then(response => {
          let data = response.data;
          localStorage.setItem("Authorization", getToken());
          // this.url = '/bpmnjs/index.html?type=lookBpmn&deploymentFileUUID='+data.deploymentID+'&deploymentName='+ encodeURI(data.resourceName);
          this.modelerUrl = '/bpmnjs/index.html?type=lookBpmn&instanceId=' + row.instanceId + '&deploymentFileUUID=' + data.deploymentID + '&deploymentName=' + encodeURI(data.resourceName);
          this.modelVisible = true
          this.modelerUrl = '/bpmnjs/index.html?type=lookBpmn&instanceId=' + row.instance_id + '&deploymentFileUUID=' + data.deploymentID + '&deploymentName=' + encodeURI(data.resourceName);
          this.modelVisible = true;
        })
      },
      /** 提交按钮 */
      submitForm() {
@@ -419,15 +419,15 @@
          if (valid) {
            if (this.form.id != null) {
              updateLeave(this.form).then(response => {
                this.msgSuccess('修改成功')
                this.open = false
                this.getList()
                this.$modal.msgSuccess('修改成功');
                this.open = false;
                this.getList();
              })
            } else {
              addLeave(this.form).then(response => {
                this.msgSuccess('新增成功')
                this.open = false
                this.getList()
                this.$modal.msgSuccess('新增成功');
                this.open = false;
                this.getList();
              })
            }
          }