From d0a74b8ee8b16fe0253bfa3f0eccd2da769f7e50 Mon Sep 17 00:00:00 2001
From: itimor <itimor@126.com>
Date: Wed, 16 Sep 2020 22:47:46 +0800
Subject: [PATCH] add

---
 backend/core/settings/base.py                 |   4 +-
 backend/systems/permissions.py                |   6 +-
 .../management/commands/init_ticket.py        |   5 +-
 .../migrations/0002_ticket_relation.py        |  18 +
 backend/tickets/models.py                     |   2 +
 backend/tickets/serializers.py                |   5 +
 backend/tickets/views.py                      |  11 +-
 backend/workflows/models.py                   |   2 +-
 frontend/src/lang/en.js                       |   1 -
 frontend/src/lang/zh.js                       |   3 +-
 frontend/src/store/modules/permission.js      |   4 +-
 frontend/src/views/ticket/all_ticket.vue      |   2 +-
 frontend/src/views/ticket/c_ticket.vue        | 419 ------------------
 frontend/src/views/ticket/my_ticket.vue       |   5 +-
 frontend/src/views/ticket/s_ticket.vue        | 171 ++++---
 frontend/src/views/ticket/u_ticket.vue        |  78 ++--
 16 files changed, 195 insertions(+), 541 deletions(-)
 create mode 100644 backend/tickets/migrations/0002_ticket_relation.py
 delete mode 100644 frontend/src/views/ticket/c_ticket.vue

diff --git a/backend/core/settings/base.py b/backend/core/settings/base.py
index 75aff1d..733323c 100644
--- a/backend/core/settings/base.py
+++ b/backend/core/settings/base.py
@@ -118,8 +118,8 @@
     'DEFAULT_PAGINATION_CLASS': 'common.pagination.StandardResultsSetPagination',
     'DEFAULT_PERMISSION_CLASSES': (
         'rest_framework.permissions.AllowAny',
-        # 'rest_framework.permissions.IsAuthenticated',
-        # 'systems.permissions.IsOwnerRoles',
+        'rest_framework.permissions.IsAuthenticated',
+        'systems.permissions.IsOwnerRoles',
     ),
     'DEFAULT_FILTER_BACKENDS': (
         'django_filters.rest_framework.DjangoFilterBackend',
diff --git a/backend/systems/permissions.py b/backend/systems/permissions.py
index 2bba119..8673f53 100644
--- a/backend/systems/permissions.py
+++ b/backend/systems/permissions.py
@@ -18,6 +18,7 @@
     '/api/sys/auth/jwt-token-auth/',
     '/api/sys/auth/getuserinfo/',
     '/api/sys/auth/getmenubutons/',
+    '/api/sys/user/',
 ]
 
 
@@ -42,8 +43,9 @@ def check_permission(request, perm):
 class IsOwnerRoles(BasePermission):
 
     def has_permission(self, request, view):
-        app = view.get_view_name().split()[0].lower()
-        perm = 'view_' + app
+        app = view.get_view_name().split()
+        object = ''.join(app[:-1]).lower()
+        perm = 'view_{}'.format(object)
         return check_permission(request, perm)
 
     def has_object_permission(self, request, view, obj):
diff --git a/backend/tickets/management/commands/init_ticket.py b/backend/tickets/management/commands/init_ticket.py
index 980b284..393eb85 100644
--- a/backend/tickets/management/commands/init_ticket.py
+++ b/backend/tickets/management/commands/init_ticket.py
@@ -20,7 +20,7 @@ def handle(self, *args, **options):
         menumodel = Menu.objects.create(name='编辑工单', code='u_ticket', curl='/u_ticket/:id', icon='u_ticket', sequence=10, type=2,
                                         hidden=True, active_menu='/new_ticket', parent_id=ticketmenu.id)
         init_menu(menumodel)
-        menumodel = Menu.objects.create(name='审核工单', code='s_ticket', curl='/s_ticket/:id', icon='s_ticket', sequence=10, type=2,
+        menumodel = Menu.objects.create(name='审批工单', code='s_ticket', curl='/s_ticket/:id', icon='s_ticket', sequence=10, type=2,
                                         hidden=True, active_menu='/todo_ticket', parent_id=ticketmenu.id)
         init_menu(menumodel)
         menumodel = Menu.objects.create(name='我的工单', code='my_ticket', curl='/my_ticket', icon='my_ticket', sequence=30, type=2,
@@ -32,7 +32,4 @@ def handle(self, *args, **options):
         menumodel = Menu.objects.create(name='所有工单', code='all_ticket', curl='/all_ticket', icon='all_ticket', sequence=90, type=2,
                                         no_cache=True, parent_id=ticketmenu.id)
         init_menu(menumodel)
-        menumodel = Menu.objects.create(name='查看工单', code='c_ticket', curl='/c_ticket/:id', icon='list', sequence=100, type=2,
-                                        hidden=True, active_menu='/my_ticket', parent_id=ticketmenu.id)
-        init_menu(menumodel)
         self.stdout.write(self.style.SUCCESS('初始化完成'))
diff --git a/backend/tickets/migrations/0002_ticket_relation.py b/backend/tickets/migrations/0002_ticket_relation.py
new file mode 100644
index 0000000..1fda8f7
--- /dev/null
+++ b/backend/tickets/migrations/0002_ticket_relation.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.0.3 on 2020-09-16 13:23
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tickets', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='ticket',
+            name='relation',
+            field=models.TextField(blank=True, default='', help_text='创建人、处理人，用于查询', verbose_name='工单关联人'),
+        ),
+    ]
diff --git a/backend/tickets/models.py b/backend/tickets/models.py
index 87ebd21..3ac1953 100644
--- a/backend/tickets/models.py
+++ b/backend/tickets/models.py
@@ -19,6 +19,8 @@ class Ticket(BaseModel):
     state = models.ForeignKey(State, on_delete=models.CASCADE, verbose_name='当前状态')
     transition = models.ForeignKey(Transition, on_delete=models.SET_NULL, blank=True, null=True, verbose_name='进行状态')
     customfield = models.TextField('所有表单数据', default=[])
+    relation = models.TextField('工单关联人', default='', blank=True, help_text='创建人、处理人，用于查询')
+
 
     def __str__(self):
         return self.name
diff --git a/backend/tickets/serializers.py b/backend/tickets/serializers.py
index bd8d203..f4c1146 100644
--- a/backend/tickets/serializers.py
+++ b/backend/tickets/serializers.py
@@ -88,6 +88,11 @@ def update(self, instance, validated_data):
         instance.transition = validated_data.get('transition', instance.transition)
         instance.customfield = validated_data.get('customfield', instance.customfield)
         instance.memo = validated_data.get('memo', instance.memo)
+
+        # update relation
+        relation = instance.relation.split(',')
+        relation.append(validated_data['relation'])
+        instance.relation = ','.join(set(relation))
         instance.save()
 
         # save ticketlog
diff --git a/backend/tickets/views.py b/backend/tickets/views.py
index a0a171e..255d3ac 100644
--- a/backend/tickets/views.py
+++ b/backend/tickets/views.py
@@ -19,11 +19,14 @@ def get_serializer_class(self):
         return TicketSerializer
 
     def get_queryset(self):
-        user = User.objects.get(username=self.request.user)
-        if user.is_admin:
+        try:
+            user = User.objects.get(username=self.request.user)
+            if user.is_admin:
+                return Ticket.objects.all()
+            else:
+                return Ticket.objects.all().filter(relation__icontains=self.request.user).distinct()
+        except:
             return Ticket.objects.all()
-        else:
-            return Ticket.objects.all().filter(ticketuser__username=self.request.user).distinct()
 
 
 class TicketFlowLogViewSet(BulkModelMixin):
diff --git a/backend/workflows/models.py b/backend/workflows/models.py
index a1e1a57..c14d311 100644
--- a/backend/workflows/models.py
+++ b/backend/workflows/models.py
@@ -16,7 +16,7 @@ def __str__(self):
 
     class Meta:
         ordering = ['order_id']
-        verbose_name = '类型'
+        verbose_name = '工作流类型'
         verbose_name_plural = verbose_name
 
 
diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index 0e4853e..0afbad7 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -21,7 +21,6 @@ export default {
     new_ticket: 'new_ticket',
     u_ticket: 'u_ticket',
     s_ticket: 's_ticket',
-    c_ticket: 'c_ticket',
     my_ticket: 'my_ticket',
     todo_ticket: 'todo_ticket',
     all_ticket: 'all_ticket',
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index 32164a9..72a77a8 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -20,8 +20,7 @@ export default {
     ticket: '工单系统',
     new_ticket: '新建工单',
     u_ticket: '编辑工单',
-    s_ticket: '审核工单',
-    c_ticket: '查看工单',
+    s_ticket: '审批工单',
     my_ticket: '我创建的',
     todo_ticket: '我的待办',
     all_ticket: '所有工单',
diff --git a/frontend/src/store/modules/permission.js b/frontend/src/store/modules/permission.js
index 435b5b2..e719aec 100644
--- a/frontend/src/store/modules/permission.js
+++ b/frontend/src/store/modules/permission.js
@@ -184,10 +184,8 @@ export const componentsMap = {
 
   // tickets
   new_ticket: () => import('@/views/ticket/new_ticket'), // 新建工单
-  c_ticket: () => import('@/views/ticket/c_ticket'), // 查看工单
   u_ticket: () => import('@/views/ticket/u_ticket'), // 编辑工单
-  u_ticket: () => import('@/views/ticket/u_ticket'), // 编辑工单
-  s_ticket: () => import('@/views/ticket/s_ticket'), // 处理工单
+  s_ticket: () => import('@/views/ticket/s_ticket'), // 审批工单
   my_ticket: () => import('@/views/ticket/my_ticket'), // 我创建的
   todo_ticket: () => import('@/views/ticket/todo_ticket'), // 我的待办
   all_ticket: () => import('@/views/ticket/all_ticket'), // 编辑工单
diff --git a/frontend/src/views/ticket/all_ticket.vue b/frontend/src/views/ticket/all_ticket.vue
index 481ac4e..bbeb071 100644
--- a/frontend/src/views/ticket/all_ticket.vue
+++ b/frontend/src/views/ticket/all_ticket.vue
@@ -41,7 +41,7 @@
       <el-table-column label="名称" prop="name"></el-table-column>
       <el-table-column label="工单流水号" prop="sn" width="240">
         <template slot-scope="{ row }">
-          <router-link :to="'/c_ticket/' + row.id">
+          <router-link :to="'/s_ticket/' + row.id">
             <el-link type="success">{{row.sn}}</el-link>
           </router-link>
         </template>
diff --git a/frontend/src/views/ticket/c_ticket.vue b/frontend/src/views/ticket/c_ticket.vue
deleted file mode 100644
index 9690f96..0000000
--- a/frontend/src/views/ticket/c_ticket.vue
+++ /dev/null
@@ -1,419 +0,0 @@
-<template>
-  <div class="app-container">
-    <div class="ticket">
-      <el-card>
-        <div slot="header" class="clearfix">
-          <span class="card-title">流程</span>
-        </div>
-        <el-steps :active="stateActive" finish-status="success" process-status="finish">
-          <el-step v-for="item in state_list" :key="item.id" :title="item.name"></el-step>
-        </el-steps>
-      </el-card>
-      <div class="ticket-form" v-if="customfield_list.length>0">
-        <el-form ref="temp" :rules="rules" :model="temp" label-width="100px">
-          <el-card>
-            <div slot="header" class="card-solt">
-              <el-form-item label="工单标题">
-                <el-input disabled v-model="this.wfdata.name" />
-              </el-form-item>
-            </div>
-            <el-row :gutter="20">
-              <el-col
-                :md="{span: [7, 8, 9, 12].includes(item.customfield.field_type)? 22 : 11}"
-                v-for="item in customfield_list"
-                :key="item.id"
-              >
-                <el-form-item
-                  :label="item.customfield.field_name"
-                  :prop="item.field_key"
-                >
-                  <el-input
-                    v-if="item.customfield.field_type === 1"
-                    v-model="item.field_value"
-                    :placeholder="item.customfield.field_name"
-                    disabled
-                  />
-
-                  <el-input-number
-                    v-if="item.customfield.field_type === 2"
-                    v-model="item.field_value"
-                    :placeholder="item.customfield.field_name"
-                    disabled
-                  ></el-input-number>
-
-                  <el-date-picker
-                    type="date"
-                    v-if="item.customfield.field_type === 5"
-                    v-model="item.field_value"
-                    :placeholder="item.customfield.field_name"
-                    disabled
-                  ></el-date-picker>
-
-                  <el-date-picker
-                    type="datetime"
-                    v-if="item.customfield.field_type === 6"
-                    v-model="item.field_value"
-                    :placeholder="item.customfield.field_name"
-                    disabled
-                  ></el-date-picker>
-
-                  <el-input
-                    type="textarea"
-                    :autosize="{ minRows: 4, maxRows: 6}"
-                    v-if="item.customfield.field_type === 8"
-                    v-model="item.field_value"
-                    :placeholder="item.customfield.field_name"
-                    disabled
-                  ></el-input>
-
-                  <el-switch
-                    active-color="#13ce66"
-                    inactive-color="#ff4949"
-                    v-if="item.customfield.field_type === 4"
-                    v-model="item.field_value"
-                    disabled
-                  ></el-switch>
-
-                  <el-radio-group
-                    v-if="item.customfield.field_type === 9"
-                    v-model="item.field_value"
-                    disabled
-                  >
-                    <el-radio
-                      v-for="(value, index) in JSON.parse(item.customfield.field_choice)"
-                      :key="index"
-                      :label="index"
-                    >{{value}}</el-radio>
-                  </el-radio-group>
-
-                  <el-checkbox-group
-                    v-if="item.customfield.field_type === 12"
-                    v-model="item.field_value"
-                    disabled
-                  >
-                    <el-checkbox
-                      v-for="(value, index)  in JSON.parse(item.customfield.field_choice)"
-                      :key="index"
-                      :label="index"
-                    >{{value}}</el-checkbox>
-                  </el-checkbox-group>
-
-                  <el-select
-                    v-if="item.customfield.field_type === 10"
-                    v-model="item.field_value"
-                    :placeholder="item.customfield.field_name"
-                    clearable
-                    disabled
-                  >
-                    <el-option
-                      v-for="(value, index)  in JSON.parse(item.customfield.field_choice)"
-                      :key="index"
-                      :value="index"
-                    >{{value}}</el-option>
-                  </el-select>
-
-                  <el-select
-                    v-if="item.customfield.field_type === 13"
-                    v-model="item.field_value"
-                    :placeholder="item.customfield.field_name"
-                    clearable
-                    multiple
-                    disabled
-                  >
-                    <el-option
-                      v-for="(value, index)  in JSON.parse(item.customfield.field_choice)"
-                      :key="index"
-                      :value="index"
-                    >{{value}}</el-option>
-                  </el-select>
-
-                  <span v-if="item.customfield.field_type === 7">
-                    <el-date-picker
-                      v-if="item.field_value.length>0"
-                      type="datetimerange"
-                      :value="formatDate(item.field_value)"
-                      :placeholder="item.customfield.field_name"
-                      disabled
-                    ></el-date-picker>
-                    <el-date-picker
-                      v-else
-                      type="datetimerange"
-                      :value="formatDate(item.field_value)"
-                      :placeholder="item.customfield.field_name"
-                      disabled
-                    ></el-date-picker>
-                  </span>
-
-                  <el-select
-                    v-if="item.customfield.field_type === 11"
-                    v-model="item.field_value"
-                    :placeholder="item.customfield.field_name"
-                    clearable
-                    disabled
-                  >
-                    <el-option v-for="t in user_list" :key="t.id" :label="t.username"></el-option>
-                  </el-select>
-
-                  <el-select
-                    v-if="item.customfield.field_type === 14"
-                    v-model="item.field_value"
-                    :placeholder="item.customfield.field_name"
-                    clearable
-                    multiple
-                    disabled
-                  >
-                    <el-option v-for="t in user_list" :key="t.id" :label="t.username"></el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-card>
-        </el-form>
-      </div>
-
-      <el-card>
-        <div slot="header" class="clearfix">
-          <span class="card-title">审批历史</span>
-        </div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="item in ticketlog_list"
-            :key="item.id"
-            :timestamp="item.create_time"
-            icon="el-icon-s-help"
-            size="large"
-            color="#0bbd87"
-            placement="top"
-          >
-            <el-card>
-              <h4 style="color:#0bbd87;">{{item.state.name}}</h4>
-              <el-form label-position="left">
-                <el-form-item label="执行人">
-                  <span>{{ item.participant }}</span>
-                </el-form-item>
-                <el-form-item label="审批意见">
-                  <span>{{ item.suggestion }}</span>
-                </el-form-item>
-              </el-form>
-            </el-card>
-          </el-timeline-item>
-        </el-timeline>
-      </el-card>
-    </div>
-  </div>
-</template>
-
-<script>
-import {
-  ticketcustomfield,
-  state,
-  transition,
-  ticket,
-  ticketflowlog,
-  user,
-  auth
-} from "@/api/all";
-import { mapGetters } from "vuex";
-
-export default {
-  name: "s_ticket",
-
-  components: {},
-  data() {
-    return {
-      visible: false,
-      tempRoute: {},
-      wfdata: {},
-      customfield_list: [],
-      state_list: [],
-      transition_list: [],
-      ticketlog_list: [],
-      user_list: [],
-      temp: {},
-      rules: {},
-      btn_types: {
-        0: "primary",
-        1: "success",
-        2: "warning",
-        3: "danger",
-        4: "danger"
-      },
-      match_fields: [],
-      workflow_temp: {
-        participant: this.username,
-        is_hidden: false
-      },
-      stateActive: 999,
-      choice_user_list: [],
-      dialogVisible: false,
-      dialogTitle: "",
-      activeName: "1",
-      participant_list: [],
-      choice_transition: {},
-      group_role_list: [],
-      participant_type: {
-        0: "无处理人",
-        1: "个人",
-        2: "部门",
-        3: "角色"
-      }
-    };
-  },
-  computed: {
-    ...mapGetters(["username"]),
-    formatDate() {
-      return function(date) {
-        const d = eval("(" + date + ")");
-        return d;
-      };
-    }
-  },
-  created() {
-    const id = this.$route.params && this.$route.params.id;
-    this.fetchData(id);
-    this.getUserList();
-    this.tempRoute = Object.assign({}, this.$route);
-  },
-  methods: {
-    fetchData(id) {
-      this.workflow_temp.ticket = id;
-      const params = {
-        id: id
-      };
-      ticket.requestGet(params).then(response => {
-        this.wfdata = response.results[0];
-        this.wfdata.memo = "";
-        this.setPageTitle();
-
-        this.workflow_temp.workflow = this.wfdata.workflow.id;
-        this.workflow_temp.source_state = this.wfdata.state.id;
-        this.match_fields = this.wfdata.state.fields;
-
-        this.getCustomfieldList();
-        this.getStateList();
-        this.getTicketlogList();
-      });
-    },
-    getCustomfieldList() {
-      ticketcustomfield.requestGet(this.workflow_temp).then(response => {
-        this.customfield_list = response.results;
-      });
-    },
-    getStateList() {
-      state.requestGet(this.workflow_temp).then(response => {
-        this.state_list = response.results;
-        for (var i in this.state_list) {
-          if (
-            this.state_list[i].id == this.wfdata.state.id &&
-            this.wfdata.state.state_type < 2
-          ) {
-            this.stateActive = parseInt(i);
-            break;
-          }
-        }
-        this.getTransitionList();
-      });
-    },
-    getTransitionList() {
-      transition.requestGet(this.workflow_temp).then(response => {
-        this.transition_list = response.results;
-      });
-    },
-    getTicketlogList() {
-      ticketflowlog.requestGet(this.workflow_temp).then(response => {
-        this.ticketlog_list = response.results;
-      });
-    },
-    getUserList() {
-      user.requestGet().then(response => {
-        this.user_list = response.results;
-      });
-    },
-    handleFilter() {
-      this.fetchData();
-    },
-    setPageTitle() {
-      const title = this.wfdata.name;
-      document.title = `${title} - 处理`;
-    },
-    selectUser(dataForm, row) {
-      this.$refs[dataForm].validate(valid => {
-        if (valid) {
-          this.dialogVisible = true;
-          this.choice_transition = row;
-          this.dialogTitle = this.participant_type[
-            row.dest_state.participant_type
-          ];
-        }
-      });
-    },
-    selectType(val) {
-      this.wfdata.participant = "";
-      this.choice_user_list = [];
-
-      if (val === 1) {
-        this.choice_user_list = this.choice_transition.dest_state.user_participant;
-      } else if (val == 2) {
-        this.group_role_list = this.choice_transition.dest_state.group_participant;
-      } else if (val == 3) {
-        this.group_role_list = this.choice_transition.dest_state.role_participant;
-      } else {
-        this.group_role_list = [];
-      }
-    },
-    checkGroupUser(id) {
-      const params = {
-        group: id
-      };
-      user.requestGet(params).then(response => {
-        this.choice_user_list = response.results;
-      });
-    },
-    checkRoleUser(id) {
-      const params = {
-        roles: id
-      };
-      user.requestGet(params).then(response => {
-        this.choice_user_list = response.results;
-      });
-    },
-    checkTableUser(row) {
-      this.wfdata.participant = row.username;
-    },
-    handleButton(dataForm, transition) {
-      const customfield = [];
-      for (var i of this.customfield_list) {
-        customfield.push({
-          id: i.id,
-          ticket: i.ticket.id,
-          customfield: i.customfield.id,
-          field_value: i.field_value
-        });
-      }
-      const data = Object.assign({}, this.wfdata, {
-        create_user: this.wfdata.create_user.id,
-        workflow: this.wfdata.workflow.id,
-        state: transition.dest_state.id,
-        transition: transition.id,
-        customfield: JSON.stringify(customfield)
-      });
-      this.$refs[dataForm].validate(valid => {
-        if (valid) {
-          ticket
-            .requestPut(this.wfdata.id, data)
-            .then(response => {
-              this.$notify({
-                title: "成功",
-                message: "更新成功",
-                type: "success",
-                duration: 2000
-              });
-              this.$router.push({ path: "/todo_ticket" });
-            })
-            .catch(() => {});
-        }
-      });
-    }
-  }
-};
-</script>
diff --git a/frontend/src/views/ticket/my_ticket.vue b/frontend/src/views/ticket/my_ticket.vue
index 502fda0..9c84753 100644
--- a/frontend/src/views/ticket/my_ticket.vue
+++ b/frontend/src/views/ticket/my_ticket.vue
@@ -32,7 +32,7 @@
       <el-table-column label="名称" prop="name"></el-table-column>
       <el-table-column label="工单流水号" prop="sn" width="240">
         <template slot-scope="{ row }">
-          <router-link :to="'/c_ticket/' + row.id">
+          <router-link :to="'/s_ticket/' + row.id">
             <el-link type="success">{{row.sn}}</el-link>
           </router-link>
         </template>
@@ -55,9 +55,6 @@
       <el-table-column label="创建时间" prop="create_time"></el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="{ row }">
-          <el-button-group>
-            <el-button v-if="permissionList.update && row.state.order_id < 3" size="small" type="success">{{ "编辑" }}</el-button>
-          </el-button-group>
           <el-button-group>
             <el-button
               v-if="permissionList.del && row.state.order_id < 3"
diff --git a/frontend/src/views/ticket/s_ticket.vue b/frontend/src/views/ticket/s_ticket.vue
index 21f9890..7934d82 100644
--- a/frontend/src/views/ticket/s_ticket.vue
+++ b/frontend/src/views/ticket/s_ticket.vue
@@ -33,14 +33,14 @@
                     v-if="item.customfield.field_type === 1"
                     v-model="item.field_value"
                     :placeholder="item.customfield.field_name"
-                    :disabled="item.customfield.field_attribute ||! match_fields.includes(item.customfield.id)"
+                    :disabled="deny_check || item.participant == username || item.customfield.field_attribute ||! match_fields.includes(item.customfield.id)"
                   />
 
                   <el-input-number
                     v-if="item.customfield.field_type === 2"
                     v-model="item.field_value"
                     :placeholder="item.customfield.field_name"
-                    :disabled="item.customfield.field_attribute ||! match_fields.includes(item.customfield.id)"
+                    :disabled="deny_check || item.participant == username || item.customfield.field_attribute ||! match_fields.includes(item.customfield.id)"
                   ></el-input-number>
 
                   <el-date-picker
@@ -48,7 +48,7 @@
                     v-if="item.customfield.field_type === 5"
                     v-model="item.field_value"
                     :placeholder="item.customfield.field_name"
-                    :disabled="item.customfield.field_attribute ||! match_fields.includes(item.customfield.id)"
+                    :disabled="deny_check || item.participant == username || item.customfield.field_attribute ||! match_fields.includes(item.customfield.id)"
                   ></el-date-picker>
 
                   <el-date-picker
@@ -56,7 +56,7 @@
                     v-if="item.customfield.field_type === 6"
                     v-model="item.field_value"
                     :placeholder="item.customfield.field_name"
-                    :disabled="item.customfield.field_attribute ||! match_fields.includes(item.customfield.id)"
+                    :disabled="deny_check || item.participant == username || item.customfield.field_attribute ||! match_fields.includes(item.customfield.id)"
                   ></el-date-picker>
 
                   <el-input
@@ -65,7 +65,7 @@
                     v-if="item.customfield.field_type === 8"
                     v-model="item.field_value"
                     :placeholder="item.customfield.field_name"
-                    :disabled="item.customfield.field_attribute ||! match_fields.includes(item.customfield.id)"
+                    :disabled="deny_check || item.participant == username || item.customfield.field_attribute ||! match_fields.includes(item.customfield.id)"
                   ></el-input>
 
                   <el-switch
@@ -73,13 +73,13 @@
                     inactive-color="#ff4949"
                     v-if="item.customfield.field_type === 4"
                     v-model="item.field_value"
-                    :disabled="item.customfield.field_attribute ||! match_fields.includes(item.customfield.id)"
+                    :disabled="deny_check || item.participant == username || item.customfield.field_attribute ||! match_fields.includes(item.customfield.id)"
                   ></el-switch>
 
                   <el-radio-group
                     v-if="item.customfield.field_type === 9"
                     v-model="item.field_value"
-                    :disabled="item.customfield.field_attribute ||! match_fields.includes(item.customfield.id)"
+                    :disabled="deny_check || item.participant == username || item.customfield.field_attribute ||! match_fields.includes(item.customfield.id)"
                   >
                     <el-radio
                       v-for="(value, index) in JSON.parse(item.customfield.field_choice)"
@@ -91,7 +91,7 @@
                   <el-checkbox-group
                     v-if="item.customfield.field_type === 12"
                     v-model="item.field_value"
-                    :disabled="item.customfield.field_attribute ||! match_fields.includes(item.customfield.id)"
+                    :disabled="deny_check || item.participant == username || item.customfield.field_attribute ||! match_fields.includes(item.customfield.id)"
                   >
                     <el-checkbox
                       v-for="(value, index)  in JSON.parse(item.customfield.field_choice)"
@@ -105,7 +105,7 @@
                     v-model="item.field_value"
                     :placeholder="item.customfield.field_name"
                     clearable
-                    :disabled="item.customfield.field_attribute ||! match_fields.includes(item.customfield.id)"
+                    :disabled="deny_check || item.participant == username || item.customfield.field_attribute ||! match_fields.includes(item.customfield.id)"
                   >
                     <el-option
                       v-for="(value, index)  in JSON.parse(item.customfield.field_choice)"
@@ -120,7 +120,7 @@
                     :placeholder="item.customfield.field_name"
                     clearable
                     multiple
-                    :disabled="item.customfield.field_attribute ||! match_fields.includes(item.customfield.id)"
+                    :disabled="deny_check || item.participant == username || item.customfield.field_attribute ||! match_fields.includes(item.customfield.id)"
                   >
                     <el-option
                       v-for="(value, index)  in JSON.parse(item.customfield.field_choice)"
@@ -135,14 +135,14 @@
                       type="datetimerange"
                       :value="formatDate(item.field_value)"
                       :placeholder="item.customfield.field_name"
-                      :disabled="item.customfield.field_attribute ||! match_fields.includes(item.customfield.id)"
+                      :disabled="deny_check || item.participant == username || item.customfield.field_attribute ||! match_fields.includes(item.customfield.id)"
                     ></el-date-picker>
                     <el-date-picker
                       v-else
                       type="datetimerange"
                       :value="formatDate(item.field_value)"
                       :placeholder="item.customfield.field_name"
-                      :disabled="item.customfield.field_attribute ||! match_fields.includes(item.customfield.id)"
+                      :disabled="deny_check || item.participant == username || item.customfield.field_attribute ||! match_fields.includes(item.customfield.id)"
                     ></el-date-picker>
                   </span>
 
@@ -151,7 +151,7 @@
                     v-model="item.field_value"
                     :placeholder="item.customfield.field_name"
                     clearable
-                    :disabled="item.customfield.field_attribute ||! match_fields.includes(item.customfield.id)"
+                    :disabled="deny_check || item.participant == username || item.customfield.field_attribute ||! match_fields.includes(item.customfield.id)"
                   >
                     <el-option v-for="t in user_list" :key="t.id" :label="t.username"></el-option>
                   </el-select>
@@ -162,37 +162,38 @@
                     :placeholder="item.customfield.field_name"
                     clearable
                     multiple
-                    :disabled="item.customfield.field_attribute ||! match_fields.includes(item.customfield.id)"
+                    :disabled="deny_check || item.participant == username || item.customfield.field_attribute ||! match_fields.includes(item.customfield.id)"
                   >
                     <el-option v-for="t in user_list" :key="t.id" :label="t.username"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
             </el-row>
+            <div v-if="!deny_check">
+              <el-form-item label="审批意见" v-if="stateActive<999">
+                <el-input
+                  type="textarea"
+                  :autosize="{ minRows: 4, maxRows: 6}"
+                  v-model="wfdata.memo"
+                  placeholder="说些啥吧"
+                ></el-input>
+              </el-form-item>
 
-            <el-form-item label="审批意见" v-if="stateActive<999">
-              <el-input
-                type="textarea"
-                :autosize="{ minRows: 4, maxRows: 6}"
-                v-model="wfdata.memo"
-                placeholder="说些啥吧"
-              ></el-input>
-            </el-form-item>
-
-            <el-form-item>
-              <span style="margin: 0 5px;" v-for="item in transition_list" :key="item.id">
-                <el-button
-                  v-if="item.name===1"
-                  :type="btn_types[item.name]"
-                  @click="selectUser('temp', item)"
-                >{{item.name|TransitionNameFilter}}</el-button>
-                <el-button
-                  v-else
-                  :type="btn_types[item.name]"
-                  @click="handleButton('temp', item)"
-                >{{item.name|TransitionNameFilter}}</el-button>
-              </span>
-            </el-form-item>
+              <el-form-item>
+                <span style="margin: 0 5px;" v-for="item in transition_list" :key="item.id">
+                  <el-button
+                    v-if="item.name===1"
+                    :type="btn_types[item.name]"
+                    @click="selectUser('temp', item)"
+                  >{{item.name|TransitionNameFilter}}</el-button>
+                  <el-button
+                    v-else
+                    :type="btn_types[item.name]"
+                    @click="handleButton('temp', item)"
+                  >{{item.name|TransitionNameFilter}}</el-button>
+                </span>
+              </el-form-item>
+            </div>
           </el-card>
         </el-form>
       </div>
@@ -211,10 +212,16 @@
             color="#0bbd87"
             placement="top"
           >
-            <el-card>
-              <h4 style="color:#0bbd87;">{{item.state.name}}</h4>
+            <el-card class="check_history">
+              <div class="check_history_title">
+                节点：<a class="state">{{item.state.name}}</a>
+                |
+                状态：<a
+                  class="transition"
+                >{{item.transition.attribute_type|AttributeTypeFilter}}</a>
+              </div>
               <el-form label-position="left">
-                <el-form-item label="执行人">
+                <el-form-item label="处理人">
                   <span>{{ item.participant }}</span>
                 </el-form-item>
                 <el-form-item label="审批意见">
@@ -293,7 +300,7 @@ import {
   ticket,
   ticketflowlog,
   user,
-  auth
+  auth,
 } from "@/api/all";
 import { mapGetters } from "vuex";
 
@@ -318,12 +325,12 @@ export default {
         1: "success",
         2: "warning",
         3: "danger",
-        4: "danger"
+        4: "danger",
       },
       match_fields: [],
       workflow_temp: {
         participant: this.username,
-        is_hidden: false
+        is_hidden: false,
       },
       stateActive: 999,
       choice_user_list: [],
@@ -337,18 +344,19 @@ export default {
         0: "无处理人",
         1: "个人",
         2: "部门",
-        3: "角色"
-      }
+        3: "角色",
+      },
+      deny_check: false, // 允许审核
     };
   },
   computed: {
     ...mapGetters(["username"]),
     formatDate() {
-      return function(date) {
+      return function (date) {
         const d = eval("(" + date + ")");
         return d;
       };
-    }
+    },
   },
   created() {
     const id = this.$route.params && this.$route.params.id;
@@ -360,10 +368,13 @@ export default {
     fetchData(id) {
       this.workflow_temp.ticket = id;
       const params = {
-        id: id
+        id: id,
       };
-      ticket.requestGet(params).then(response => {
+      ticket.requestGet(params).then((response) => {
         this.wfdata = response.results[0];
+        if (this.wfdata.participant !== this.username) {
+          this.deny_check = true;
+        }
         this.wfdata.memo = "";
         this.setPageTitle();
 
@@ -377,12 +388,12 @@ export default {
       });
     },
     getCustomfieldList() {
-      ticketcustomfield.requestGet(this.workflow_temp).then(response => {
+      ticketcustomfield.requestGet(this.workflow_temp).then((response) => {
         this.customfield_list = response.results;
       });
     },
     getStateList() {
-      state.requestGet(this.workflow_temp).then(response => {
+      state.requestGet(this.workflow_temp).then((response) => {
         this.state_list = response.results;
         for (var i in this.state_list) {
           if (
@@ -397,17 +408,17 @@ export default {
       });
     },
     getTransitionList() {
-      transition.requestGet(this.workflow_temp).then(response => {
+      transition.requestGet(this.workflow_temp).then((response) => {
         this.transition_list = response.results;
       });
     },
     getTicketlogList() {
-      ticketflowlog.requestGet(this.workflow_temp).then(response => {
+      ticketflowlog.requestGet(this.workflow_temp).then((response) => {
         this.ticketlog_list = response.results;
       });
     },
     getUserList() {
-      user.requestGet().then(response => {
+      user.requestGet().then((response) => {
         this.user_list = response.results;
       });
     },
@@ -416,10 +427,10 @@ export default {
     },
     setPageTitle() {
       const title = this.wfdata.name;
-      document.title = `${title} - 处理`;
+      document.title = `${title} - 审批`;
     },
     selectUser(dataForm, row) {
-      this.$refs[dataForm].validate(valid => {
+      this.$refs[dataForm].validate((valid) => {
         if (valid) {
           this.dialogVisible = true;
           this.choice_transition = row;
@@ -445,17 +456,17 @@ export default {
     },
     checkGroupUser(id) {
       const params = {
-        group: id
+        group: id,
       };
-      user.requestGet(params).then(response => {
+      user.requestGet(params).then((response) => {
         this.choice_user_list = response.results;
       });
     },
     checkRoleUser(id) {
       const params = {
-        roles: id
+        roles: id,
       };
-      user.requestGet(params).then(response => {
+      user.requestGet(params).then((response) => {
         this.choice_user_list = response.results;
       });
     },
@@ -469,33 +480,59 @@ export default {
           id: i.id,
           ticket: i.ticket.id,
           customfield: i.customfield.id,
-          field_value: i.field_value
+          field_value: i.field_value,
         });
       }
       const data = Object.assign({}, this.wfdata, {
         create_user: this.wfdata.create_user.id,
         workflow: this.wfdata.workflow.id,
+        participant: this.wfdata.participant,
         state: transition.dest_state.id,
         transition: transition.id,
-        customfield: JSON.stringify(customfield)
+        customfield: JSON.stringify(customfield),
+        relation: this.username,
       });
-      this.$refs[dataForm].validate(valid => {
+      if (transition.name == 1) {
+        data.participant = this.wfdata.participant;
+        data.relation = this.wfdata.participant;
+      } else {
+        data.participant = this.ticketlog_list[this.ticketlog_list.length-1].participant;
+      }
+      this.$refs[dataForm].validate((valid) => {
         if (valid) {
           ticket
             .requestPut(this.wfdata.id, data)
-            .then(response => {
+            .then((response) => {
               this.$notify({
                 title: "成功",
                 message: "更新成功",
                 type: "success",
-                duration: 2000
+                duration: 2000,
               });
               this.$router.push({ path: "/todo_ticket" });
             })
             .catch(() => {});
         }
       });
-    }
-  }
+    },
+  },
 };
 </script>
+
+<style scoped lang="scss">
+.check_history {
+  .check_history_title {
+    font-weight: 700;
+    margin: 10px 0;
+    .state {
+      color: #0bbd87;
+    }
+    .transition {
+      color: #f1bd5f;
+    }
+  }
+  .el-form-item {
+    margin-bottom: 5px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/frontend/src/views/ticket/u_ticket.vue b/frontend/src/views/ticket/u_ticket.vue
index c670665..45a3194 100644
--- a/frontend/src/views/ticket/u_ticket.vue
+++ b/frontend/src/views/ticket/u_ticket.vue
@@ -140,7 +140,12 @@
                     clearable
                     :disabled="item.field_attribute ||! match_fields.includes(item.id)"
                   >
-                    <el-option v-for="t in user_list" :key="t.id" :label="t.username" :value="t.username"></el-option>
+                    <el-option
+                      v-for="t in user_list"
+                      :key="t.id"
+                      :label="t.username"
+                      :value="t.username"
+                    ></el-option>
                   </el-select>
 
                   <el-select
@@ -151,7 +156,12 @@
                     multiple
                     :disabled="item.field_attribute ||! match_fields.includes(item.id)"
                   >
-                    <el-option v-for="t in user_list" :key="t.id" :label="t.username" :value="t.username"></el-option>
+                    <el-option
+                      v-for="t in user_list"
+                      :key="t.id"
+                      :label="t.username"
+                      :value="t.username"
+                    ></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -166,7 +176,7 @@
                 <el-button
                   v-else
                   :type="btn_types[item.name]"
-                  @click="handleButton('temp', item)"
+                  @click="handleSave('temp', item)"
                 >{{item.name|TransitionNameFilter}}</el-button>
               </span>
             </el-form-item>
@@ -244,14 +254,14 @@ import {
   transition,
   ticket,
   user,
-  auth
+  auth,
 } from "@/api/all";
 
 import {
   checkAuthAdd,
   checkAuthDel,
   checkAuthView,
-  checkAuthUpdate
+  checkAuthUpdate,
 } from "@/utils/permission";
 import { mapGetters } from "vuex";
 import { GenDatetime } from "@/utils";
@@ -267,7 +277,7 @@ export default {
         add: false,
         del: false,
         view: false,
-        update: false
+        update: false,
       },
       tempRoute: {},
       wfdata: {},
@@ -281,15 +291,15 @@ export default {
         0: "primary",
         1: "success",
         2: "warning",
-        3: "danger"
+        3: "danger",
       },
       match_fields: [],
       ticket: {
         name: "",
-        participant: ""
+        participant: "",
       },
       workflow_temp: {
-        participant: this.user_id
+        participant: this.user_id,
       },
       choice_user_list: [],
       dialogTitle: "",
@@ -302,12 +312,12 @@ export default {
         0: "无处理人",
         1: "个人",
         2: "部门",
-        3: "角色"
-      }
+        3: "角色",
+      },
     };
   },
   computed: {
-    ...mapGetters(["user_id"])
+    ...mapGetters(["username", "user_id"]),
   },
   created() {
     const id = this.$route.params && this.$route.params.id;
@@ -319,9 +329,9 @@ export default {
     fetchData(id) {
       this.workflow_temp.workflow = id;
       const params = {
-        id: id
+        id: id,
       };
-      workflow.requestGet(params).then(response => {
+      workflow.requestGet(params).then((response) => {
         this.wfdata = response.results[0];
         this.setPageTitle();
 
@@ -332,12 +342,12 @@ export default {
       });
     },
     getCustomfieldList() {
-      customfield.requestGet(this.workflow_temp).then(response => {
+      customfield.requestGet(this.workflow_temp).then((response) => {
         this.customfield_list = response.results;
       });
     },
     getStateList(id) {
-      state.requestGet(this.workflow_temp).then(response => {
+      state.requestGet(this.workflow_temp).then((response) => {
         this.state_list = response.results;
         this.match_fields = this.state_list[1].fields;
         this.getTransitionList(this.state_list[0].id);
@@ -345,12 +355,12 @@ export default {
     },
     getTransitionList(source_state) {
       this.workflow_temp.source_state = source_state;
-      transition.requestGet(this.workflow_temp).then(response => {
+      transition.requestGet(this.workflow_temp).then((response) => {
         this.transition_list = response.results;
       });
     },
     getUserList() {
-      user.requestGet().then(response => {
+      user.requestGet().then((response) => {
         this.user_list = response.results;
       });
     },
@@ -362,7 +372,7 @@ export default {
       document.title = `${title} - 创建`;
     },
     selectUser(dataForm, row) {
-      this.$refs[dataForm].validate(valid => {
+      this.$refs[dataForm].validate((valid) => {
         if (valid) {
           this.dialogVisible = true;
           this.choice_transition = row;
@@ -388,23 +398,27 @@ export default {
     },
     checkGroupUser(id) {
       const params = {
-        group: id
+        group: id,
       };
-      user.requestGet(params).then(response => {
+      user.requestGet(params).then((response) => {
         this.choice_user_list = response.results;
       });
     },
     checkRoleUser(id) {
       const params = {
-        roles: id
+        roles: id,
       };
-      user.requestGet(params).then(response => {
+      user.requestGet(params).then((response) => {
         this.choice_user_list = response.results;
       });
     },
     checkTableUser(row) {
       this.ticket.participant = row.username;
     },
+    handleSave(dataForm, transition) {
+      this.ticket.participant = this.username;
+      this.handleButton(dataForm, transition);
+    },
     handleButton(dataForm, transition) {
       this.dialogVisible = false;
       const customfield = [];
@@ -413,13 +427,13 @@ export default {
           customfield.push({
             customfield: i.id,
             field_key: i.field_key,
-            field_value: this.temp[i.field_key]
+            field_value: this.temp[i.field_key],
           });
         } else {
           customfield.push({
             customfield: i.id,
             field_key: i.field_key,
-            field_value: ""
+            field_value: "",
           });
         }
       }
@@ -432,26 +446,28 @@ export default {
           workflow: this.wfdata.id,
           state: transition.dest_state.id,
           transition: transition.id,
-          customfield: JSON.stringify(customfield)
+          customfield: JSON.stringify(customfield),
+          relation: this.ticket.participant,
         }
       );
-      this.$refs[dataForm].validate(valid => {
+      console.log(data)
+      this.$refs[dataForm].validate((valid) => {
         if (valid) {
           ticket
             .requestPost(data)
-            .then(res => {
+            .then((res) => {
               this.$notify({
                 title: "成功",
                 message: "创建成功",
                 type: "success",
-                duration: 2000
+                duration: 2000,
               });
               this.$router.push({ path: "/my_ticket" });
             })
             .catch(() => {});
         }
       });
-    }
-  }
+    },
+  },
 };
 </script>