Skip to content

Commit 6cd4214

Browse files
xingyuvxingyuv
committed
fix slot-scope
1 parent ef6f858 commit 6cd4214

File tree

53 files changed

+247
-247
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+247
-247
lines changed

‎src/views/bpm/definition/index.vue

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@
66
<el-table v-loading="loading" :data="list">
77
<el-table-column label="定义编号" align="center" prop="id" width="400" />
88
<el-table-column label="定义名称" align="center" prop="name" width="100">
9-
<template slot-scope="scope">
9+
<template v-slot="scope">
1010
<el-button type="text" @click="handleBpmnDetail(scope.row)">
1111
<span>{{ scope.row.name }}</span>
1212
</el-button>
1313
</template>
1414
</el-table-column>
1515
<el-table-column label="定义分类" align="center" prop="category" width="100">
16-
<template slot-scope="scope">
16+
<template v-slot="scope">
1717
<dict-tag :type="DICT_TYPE.BPM_MODEL_CATEGORY" :value="scope.row.category" />
1818
</template>
1919
</el-table-column>
2020
<el-table-column label="表单信息" align="center" prop="formType" width="200">
21-
<template slot-scope="scope">
21+
<template v-slot="scope">
2222
<el-button v-if="scope.row.formId" type="text" @click="handleFormDetail(scope.row)">
2323
<span>{{ scope.row.formName }}</span>
2424
</el-button>
@@ -29,25 +29,25 @@
2929
</template>
3030
</el-table-column>
3131
<el-table-column label="流程版本" align="center" prop="processDefinition.version" width="80">
32-
<template slot-scope="scope">
32+
<template v-slot="scope">
3333
<el-tag size="medium" v-if="scope.row">v{{ scope.row.version }}</el-tag>
3434
<el-tag size="medium" type="warning" v-else>未部署</el-tag>
3535
</template>
3636
</el-table-column>
3737
<el-table-column label="状态" align="center" prop="version" width="80">
38-
<template slot-scope="scope">
38+
<template v-slot="scope">
3939
<el-tag type="success" v-if="scope.row.suspensionState === 1">激活</el-tag>
4040
<el-tag type="warning" v-if="scope.row.suspensionState === 2">挂起</el-tag>
4141
</template>
4242
</el-table-column>
4343
<el-table-column label="部署时间" align="center" prop="deploymentTime" width="180">
44-
<template slot-scope="scope">
44+
<template v-slot="scope">
4545
<span>{{ parseTime(scope.row.deploymentTime) }}</span>
4646
</template>
4747
</el-table-column>
4848
<el-table-column label="定义描述" align="center" prop="description" width="300" show-overflow-tooltip />
4949
<el-table-column label="操作" align="center" width="150" fixed="right">
50-
<template slot-scope="scope">
50+
<template v-slot="scope">
5151
<el-button size="mini" type="text" icon="el-icon-s-custom" @click="handleAssignRule(scope.row)"
5252
v-hasPermi="['bpm:task-assign-rule:update']">分配规则</el-button>
5353
</template>

‎src/views/bpm/form/index.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,18 @@
2727
<el-table-column label="编号" align="center" prop="id" />
2828
<el-table-column label="表单名" align="center" prop="name" />
2929
<el-table-column label="开启状态" align="center" prop="status">
30-
<template slot-scope="scope">
30+
<template v-slot="scope">
3131
<dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status"/>
3232
</template>
3333
</el-table-column>
3434
<el-table-column label="备注" align="center" prop="remark" />
3535
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
36-
<template slot-scope="scope">
36+
<template v-slot="scope">
3737
<span>{{ parseTime(scope.row.createTime) }}</span>
3838
</template>
3939
</el-table-column>
4040
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
41-
<template slot-scope="scope">
41+
<template v-slot="scope">
4242
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleDetail(scope.row)"
4343
v-hasPermi="['bpm:form:query']">详情</el-button>
4444
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"

‎src/views/bpm/group/index.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,24 +38,24 @@
3838
<el-table-column label="组名" align="center" prop="name" />
3939
<el-table-column label="描述" align="center" prop="description" />
4040
<el-table-column label="成员" align="center">
41-
<template slot-scope="scope">
41+
<template v-slot="scope">
4242
<span v-for="userId in scope.row.memberUserIds">
4343
{{ getUserNickname(userId) }}
4444
</span>
4545
</template>
4646
</el-table-column>
4747
<el-table-column label="状态" align="center" prop="status">
48-
<template slot-scope="scope">
48+
<template v-slot="scope">
4949
<dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
5050
</template>
5151
</el-table-column>
5252
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
53-
<template slot-scope="scope">
53+
<template v-slot="scope">
5454
<span>{{ parseTime(scope.row.createTime) }}</span>
5555
</template>
5656
</el-table-column>
5757
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
58-
<template slot-scope="scope">
58+
<template v-slot="scope">
5959
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
6060
v-hasPermi="['bpm:user-group:update']">修改</el-button>
6161
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"

‎src/views/bpm/model/index.vue

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,19 +40,19 @@
4040
<el-table v-loading="loading" :data="list">
4141
<el-table-column label="流程标识" align="center" prop="key" />
4242
<el-table-column label="流程名称" align="center" prop="name" width="200">
43-
<template slot-scope="scope">
43+
<template v-slot="scope">
4444
<el-button type="text" @click="handleBpmnDetail(scope.row)">
4545
<span>{{ scope.row.name }}</span>
4646
</el-button>
4747
</template>
4848
</el-table-column>
4949
<el-table-column label="流程分类" align="center" prop="category" width="100">
50-
<template slot-scope="scope">
50+
<template v-slot="scope">
5151
<dict-tag :type="DICT_TYPE.BPM_MODEL_CATEGORY" :value="scope.row.category" />
5252
</template>
5353
</el-table-column>
5454
<el-table-column label="表单信息" align="center" prop="formType" width="200">
55-
<template slot-scope="scope">
55+
<template v-slot="scope">
5656
<el-button v-if="scope.row.formId" type="text" @click="handleFormDetail(scope.row)">
5757
<span>{{ scope.row.formName }}</span>
5858
</el-button>
@@ -63,31 +63,31 @@
6363
</template>
6464
</el-table-column>
6565
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
66-
<template slot-scope="scope">
66+
<template v-slot="scope">
6767
<span>{{ parseTime(scope.row.createTime) }}</span>
6868
</template>
6969
</el-table-column>
7070
<el-table-column label="最新部署的流程定义" align="center">
7171
<el-table-column label="流程版本" align="center" prop="processDefinition.version" width="80">
72-
<template slot-scope="scope">
72+
<template v-slot="scope">
7373
<el-tag size="medium" v-if="scope.row.processDefinition">v{{ scope.row.processDefinition.version }}</el-tag>
7474
<el-tag size="medium" type="warning" v-else>未部署</el-tag>
7575
</template>
7676
</el-table-column>
7777
<el-table-column label="激活状态" align="center" prop="processDefinition.version" width="80">
78-
<template slot-scope="scope">
78+
<template v-slot="scope">
7979
<el-switch v-if="scope.row.processDefinition" v-model="scope.row.processDefinition.suspensionState"
8080
:active-value="1" :inactive-value="2" @change="handleChangeState(scope.row)" />
8181
</template>
8282
</el-table-column>
8383
<el-table-column label="部署时间" align="center" prop="deploymentTime" width="180">
84-
<template slot-scope="scope">
84+
<template v-slot="scope">
8585
<span v-if="scope.row.processDefinition">{{ parseTime(scope.row.processDefinition.deploymentTime) }}</span>
8686
</template>
8787
</el-table-column>
8888
</el-table-column>
8989
<el-table-column label="操作" align="center" width="450" fixed="right">
90-
<template slot-scope="scope">
90+
<template v-slot="scope">
9191
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
9292
v-hasPermi="['bpm:model:update']">修改流程</el-button>
9393
<el-button size="mini" type="text" icon="el-icon-setting" @click="handleDesign(scope.row)"

‎src/views/bpm/oa/leave/index.vue

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,33 +41,33 @@
4141
<el-table v-loading="loading" :data="list">
4242
<el-table-column label="申请编号" align="center" prop="id" />
4343
<el-table-column label="状态" align="center" prop="result">
44-
<template slot-scope="scope">
44+
<template v-slot="scope">
4545
<dict-tag :type="DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT" :value="scope.row.result"/>
4646
</template>
4747
</el-table-column>
4848
<el-table-column label="开始时间" align="center" prop="startTime" width="180">
49-
<template slot-scope="scope">
49+
<template v-slot="scope">
5050
<span>{{ parseTime(scope.row.startTime) }}</span>
5151
</template>
5252
</el-table-column>
5353
<el-table-column label="结束时间" align="center" prop="endTime" width="180">
54-
<template slot-scope="scope">
54+
<template v-slot="scope">
5555
<span>{{ parseTime(scope.row.endTime) }}</span>
5656
</template>
5757
</el-table-column>
5858
<el-table-column label="请假类型" align="center" prop="type">
59-
<template slot-scope="scope">
59+
<template v-slot="scope">
6060
<dict-tag :type="DICT_TYPE.BPM_OA_LEAVE_TYPE" :value="scope.row.type"/>
6161
</template>
6262
</el-table-column>
6363
<el-table-column label="原因" align="center" prop="reason" />
6464
<el-table-column label="申请时间" align="center" prop="applyTime" width="180">
65-
<template slot-scope="scope">
65+
<template v-slot="scope">
6666
<span>{{ parseTime(scope.row.createTime) }}</span>
6767
</template>
6868
</el-table-column>
6969
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
70-
<template slot-scope="scope">
70+
<template v-slot="scope">
7171
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleCancel(scope.row)"
7272
v-hasPermi="['bpm:oa-leave:create']" v-if="scope.row.result === 1">取消请假</el-button>
7373
<el-button size="mini" type="text" icon="el-icon-view" @click="handleDetail(scope.row)"

‎src/views/bpm/processInstance/create.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,25 @@
44
<div v-if="!selectProcessInstance">
55
<el-table v-loading="loading" :data="list">
66
<el-table-column label="流程名称" align="center" prop="name" width="200">
7-
<template slot-scope="scope">
7+
<template v-slot="scope">
88
<el-button type="text" @click="handleBpmnDetail(scope.row)">
99
<span>{{ scope.row.name }}</span>
1010
</el-button>
1111
</template>
1212
</el-table-column>
1313
<el-table-column label="流程分类" align="center" prop="category" width="100">
14-
<template slot-scope="scope">
14+
<template v-slot="scope">
1515
<dict-tag :type="DICT_TYPE.BPM_MODEL_CATEGORY" :value="scope.row.category" />
1616
</template>
1717
</el-table-column>
1818
<el-table-column label="流程版本" align="center" prop="processDefinition.version" width="80">
19-
<template slot-scope="scope">
19+
<template v-slot="scope">
2020
<el-tag size="medium" v-if="scope.row">v{{ scope.row.version }}</el-tag>
2121
</template>
2222
</el-table-column>
2323
<el-table-column label="流程描述" align="center" prop="description" width="300" show-overflow-tooltip />
2424
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
25-
<template slot-scope="scope">
25+
<template v-slot="scope">
2626
<el-button type="text" size="small" icon="el-icon-plus" @click="handleSelect(scope.row)">选择</el-button>
2727
</template>
2828
</el-table-column>

‎src/views/bpm/processInstance/index.vue

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,39 +52,39 @@
5252
<el-table-column label="编号" align="center" prop="id" width="320" />
5353
<el-table-column label="流程名" align="center" prop="name" />
5454
<el-table-column label="流程分类" align="center" prop="category">
55-
<template slot-scope="scope">
55+
<template v-slot="scope">
5656
<dict-tag :type="DICT_TYPE.BPM_MODEL_CATEGORY" :value="scope.row.category" />
5757
</template>
5858
</el-table-column>
5959
<el-table-column label="当前审批任务" align="center" prop="tasks">
60-
<template slot-scope="scope">
60+
<template v-slot="scope">
6161
<el-button v-for="task in scope.row.tasks" :key="task.id" type="text" @click="handleFormDetail(task.id)">
6262
<span>{{ task.name }}</span>
6363
</el-button>
6464
</template>
6565
</el-table-column>
6666
<el-table-column label="状态" align="center" prop="status">
67-
<template slot-scope="scope">
67+
<template v-slot="scope">
6868
<dict-tag :type="DICT_TYPE.BPM_PROCESS_INSTANCE_STATUS" :value="scope.row.status" />
6969
</template>
7070
</el-table-column>
7171
<el-table-column label="结果" align="center" prop="result">
72-
<template slot-scope="scope">
72+
<template v-slot="scope">
7373
<dict-tag :type="DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT" :value="scope.row.result"/>
7474
</template>
7575
</el-table-column>
7676
<el-table-column label="提交时间" align="center" prop="createTime" width="180">
77-
<template slot-scope="scope">
77+
<template v-slot="scope">
7878
<span>{{ parseTime(scope.row.createTime) }}</span>
7979
</template>
8080
</el-table-column>
8181
<el-table-column label="结束时间" align="center" prop="createTime" width="180">
82-
<template slot-scope="scope">
82+
<template v-slot="scope">
8383
<span>{{ parseTime(scope.row.endTime) }}</span>
8484
</template>
8585
</el-table-column>
8686
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
87-
<template slot-scope="scope">
87+
<template v-slot="scope">
8888
<el-button type="text" size="small" icon="el-icon-delete" v-if="scope.row.result === 1"
8989
v-hasPermi="['bpm:process-instance:cancel']" @click="handleCancel(scope.row)">取消</el-button>
9090
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleDetail(scope.row)"

‎src/views/bpm/task/done.vue

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,28 +24,28 @@
2424
<el-table-column label="所属流程" align="center" prop="processInstance.name" width="200" />
2525
<el-table-column label="流程发起人" align="center" prop="processInstance.startUserNickname" width="120" />
2626
<el-table-column label="结果" align="center" prop="result">
27-
<template slot-scope="scope">
27+
<template v-slot="scope">
2828
<dict-tag :type="DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT" :value="scope.row.result"/>
2929
</template>
3030
</el-table-column>
3131
<el-table-column label="审批意见" align="center" prop="reason" width="200" />
3232
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
33-
<template slot-scope="scope">
33+
<template v-slot="scope">
3434
<span>{{ parseTime(scope.row.createTime) }}</span>
3535
</template>
3636
</el-table-column>
3737
<el-table-column label="审批时间" align="center" prop="endTime" width="180">
38-
<template slot-scope="scope">
38+
<template v-slot="scope">
3939
<span>{{ parseTime(scope.row.endTime) }}</span>
4040
</template>
4141
</el-table-column>
4242
<el-table-column label="耗时" align="center" prop="durationInMillis" width="180">
43-
<template slot-scope="scope">
43+
<template v-slot="scope">
4444
<span>{{ getDateStar(scope.row.durationInMillis) }}</span>
4545
</template>
4646
</el-table-column>
4747
<el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
48-
<template slot-scope="scope">
48+
<template v-slot="scope">
4949
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleAudit(scope.row)"
5050
v-hasPermi="['bpm:task:query']">详情</el-button>
5151
</template>

‎src/views/bpm/task/todo.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,18 @@
2424
<el-table-column label="所属流程" align="center" prop="processInstance.name" />
2525
<el-table-column label="流程发起人" align="center" prop="processInstance.startUserNickname" />
2626
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
27-
<template slot-scope="scope">
27+
<template v-slot="scope">
2828
<span>{{ parseTime(scope.row.createTime) }}</span>
2929
</template>
3030
</el-table-column>
3131
<el-table-column label="状态" align="center" prop="version" width="80">
32-
<template slot-scope="scope">
32+
<template v-slot="scope">
3333
<el-tag type="success" v-if="scope.row.suspensionState === 1">激活</el-tag>
3434
<el-tag type="warning" v-if="scope.row.suspensionState === 2">挂起</el-tag>
3535
</template>
3636
</el-table-column>
3737
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
38-
<template slot-scope="scope">
38+
<template v-slot="scope">
3939
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleAudit(scope.row)"
4040
v-hasPermi="['bpm:task:update']">审批</el-button>
4141
</template>

‎src/views/bpm/taskAssignRule/taskAssignRuleDialog.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@
66
<el-table-column label="任务名" align="center" prop="taskDefinitionName" width="120" fixed />
77
<el-table-column label="任务标识" align="center" prop="taskDefinitionKey" width="120" show-tooltip-when-overflow />
88
<el-table-column label="规则类型" align="center" prop="type" width="120">
9-
<template slot-scope="scope">
9+
<template v-slot="scope">
1010
<dict-tag :type="DICT_TYPE.BPM_TASK_ASSIGN_RULE_TYPE" :value="scope.row.type" />
1111
</template>
1212
</el-table-column>
1313
<el-table-column label="规则范围" align="center" prop="options" width="440px">
14-
<template slot-scope="scope">
14+
<template v-slot="scope">
1515
<el-tag size="medium" v-if="scope.row.options" :key="option" v-for="option in scope.row.options">
1616
{{ getAssignRuleOptionName(scope.row.type, option) }}
1717
</el-tag>
1818
</template>
1919
</el-table-column>
2020
<el-table-column v-if="modelId" label="操作" align="center" width="80" fixed="right">
21-
<template slot-scope="scope">
21+
<template v-slot="scope">
2222
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdateTaskAssignRule(scope.row)"
2323
v-hasPermi="['bpm:task-assign-rule:update']">修改</el-button>
2424
</template>

0 commit comments

Comments
 (0)