n20-common-lib 2.1.9 → 2.1.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -3,75 +3,71 @@
|
|
|
3
3
|
<div>
|
|
4
4
|
<el-form label-position="right" :label-width="_lang === 'zh' ? '5em' : '10em'">
|
|
5
5
|
<div v-if="taskId && showBtn" class="flex-box">
|
|
6
|
-
<
|
|
7
|
-
<el-
|
|
6
|
+
<el-form-item v-if="authList.includes('isCarboncopy')" :label="'抄送' | $lc" class="flex-1 m-b-s">
|
|
7
|
+
<el-input
|
|
8
|
+
:value="carbonCopyList.map((c) => c.uname).join(', ')"
|
|
9
|
+
type="textarea"
|
|
10
|
+
:autosize="{ minRows: 1 }"
|
|
11
|
+
@focus="setCarboncopyV = true"
|
|
12
|
+
/>
|
|
13
|
+
</el-form-item>
|
|
14
|
+
<el-form-item v-if="authList.includes('isAddtask')" :label="'加签' | $lc" :error="addMsg" class="flex-1 m-b-s">
|
|
15
|
+
<label slot="label">
|
|
16
|
+
<span>{{ '加签' | $lc }}</span>
|
|
17
|
+
<el-tooltip placement="top">
|
|
18
|
+
<span class="n20-icon-xinxitishi m-l-ss" style="position: static"></span>
|
|
19
|
+
<div slot="content" style="width: 16em; line-height: 1.6">
|
|
20
|
+
{{ '会签并行：增加一个会签节点，全部审批人同意才可通过审批' | $lc }}<br />
|
|
21
|
+
{{ '普通串行：按照加签人数增加节点，每个节点审批通过才可完成当前加签流程' | $lc }}
|
|
22
|
+
</div>
|
|
23
|
+
</el-tooltip>
|
|
24
|
+
</label>
|
|
25
|
+
<div class="flex-box">
|
|
26
|
+
<el-select v-model="addTaskType" clearable :placeholder="'请选择审批方式' | $lc" style="width: 10em">
|
|
27
|
+
<!-- <el-option :label="'普通节点' | $lc" value="1" /> -->
|
|
28
|
+
<el-option :label="'会签并行' | $lc" value="2" />
|
|
29
|
+
<el-option :label="'普通串行' | $lc" value="3" />
|
|
30
|
+
</el-select>
|
|
8
31
|
<el-input
|
|
9
|
-
|
|
32
|
+
class="flex-item"
|
|
10
33
|
type="textarea"
|
|
34
|
+
:value="addTaskList.map((c) => c.uname).join(', ')"
|
|
11
35
|
:autosize="{ minRows: 1 }"
|
|
12
|
-
@focus="
|
|
13
|
-
/>
|
|
14
|
-
</el-form-item>
|
|
15
|
-
</div>
|
|
16
|
-
<div v-if="authList.includes('isAddtask')" class="flex-1">
|
|
17
|
-
<el-form-item :label="'加签' | $lc" :error="addMsg">
|
|
18
|
-
<label slot="label">
|
|
19
|
-
<span>{{ '加签' | $lc }}</span>
|
|
20
|
-
<el-tooltip placement="top">
|
|
21
|
-
<span class="n20-icon-xinxitishi m-l-ss" style="position: static"></span>
|
|
22
|
-
<div slot="content" style="width: 16em; line-height: 1.6">
|
|
23
|
-
{{ '会签并行：增加一个会签节点，全部审批人同意才可通过审批' | $lc }}<br />
|
|
24
|
-
{{ '普通串行：按照加签人数增加节点，每个节点审批通过才可完成当前加签流程' | $lc }}
|
|
25
|
-
</div>
|
|
26
|
-
</el-tooltip>
|
|
27
|
-
</label>
|
|
28
|
-
<div class="flex-box">
|
|
29
|
-
<el-select v-model="addTaskType" clearable :placeholder="'请选择审批方式' | $lc" style="width: 10em">
|
|
30
|
-
<!-- <el-option :label="'普通节点' | $lc" value="1" /> -->
|
|
31
|
-
<el-option :label="'会签并行' | $lc" value="2" />
|
|
32
|
-
<el-option :label="'普通串行' | $lc" value="3" />
|
|
33
|
-
</el-select>
|
|
34
|
-
<el-input
|
|
35
|
-
class="flex-item"
|
|
36
|
-
type="textarea"
|
|
37
|
-
:value="addTaskList.map((c) => c.uname).join(', ')"
|
|
38
|
-
:autosize="{ minRows: 1 }"
|
|
39
|
-
@focus="setAddtaskV = true"
|
|
40
|
-
/>
|
|
41
|
-
</div>
|
|
42
|
-
</el-form-item>
|
|
43
|
-
</div>
|
|
44
|
-
</div>
|
|
45
|
-
<el-form-item :label="'审批意见' | $lc" :error="errMsg">
|
|
46
|
-
<el-input
|
|
47
|
-
ref="msg-input"
|
|
48
|
-
v-model="messageC"
|
|
49
|
-
type="textarea"
|
|
50
|
-
:placeholder="
|
|
51
|
-
('请输入操作意见（' + messageMax + '字以内），批准该意见为非必填，驳回/作废该意见为必填！') | $lc
|
|
52
|
-
"
|
|
53
|
-
:maxlength="messageMax"
|
|
54
|
-
:autosize="{ minRows: 1 }"
|
|
55
|
-
/>
|
|
56
|
-
</el-form-item>
|
|
57
|
-
<template v-if="taskId && showBtn">
|
|
58
|
-
<el-form-item v-if="authList.includes('showAppOpi') || authList.includes('showOtherAtt')" label=" ">
|
|
59
|
-
<div class="flex-box">
|
|
60
|
-
<show-app-opi
|
|
61
|
-
v-if="authList.includes('showAppOpi')"
|
|
62
|
-
class="flex-1"
|
|
63
|
-
:task-id="taskId"
|
|
64
|
-
:message.sync="messageC"
|
|
65
|
-
/>
|
|
66
|
-
<show-other-att
|
|
67
|
-
v-if="authList.includes('showOtherAtt')"
|
|
68
|
-
class="flex-1"
|
|
69
|
-
:task-id="taskId"
|
|
70
|
-
:other-att="otherAtt"
|
|
36
|
+
@focus="setAddtaskV = true"
|
|
71
37
|
/>
|
|
72
38
|
</div>
|
|
73
39
|
</el-form-item>
|
|
74
|
-
</
|
|
40
|
+
</div>
|
|
41
|
+
<div class="flex-box">
|
|
42
|
+
<el-form-item class="flex-1" :label="'审批意见' | $lc" :error="errMsg" style="width: 70%">
|
|
43
|
+
<el-input
|
|
44
|
+
ref="msg-input"
|
|
45
|
+
v-model="messageC"
|
|
46
|
+
type="textarea"
|
|
47
|
+
:placeholder="
|
|
48
|
+
('请输入操作意见（' + messageMax + '字以内），批准该意见为非必填，驳回/作废该意见为必填！') | $lc
|
|
49
|
+
"
|
|
50
|
+
:maxlength="messageMax"
|
|
51
|
+
:autosize="{ rows: 1 }"
|
|
52
|
+
/>
|
|
53
|
+
</el-form-item>
|
|
54
|
+
<template v-if="taskId && showBtn">
|
|
55
|
+
<show-app-opi
|
|
56
|
+
v-if="authList.includes('showAppOpi')"
|
|
57
|
+
class="flex-1 m-l-s"
|
|
58
|
+
:task-id="taskId"
|
|
59
|
+
:message.sync="messageC"
|
|
60
|
+
style="width: 20%"
|
|
61
|
+
/>
|
|
62
|
+
<show-other-att
|
|
63
|
+
v-if="authList.includes('showOtherAtt')"
|
|
64
|
+
class="flex-1 m-l"
|
|
65
|
+
:task-id="taskId"
|
|
66
|
+
:other-att="otherAtt"
|
|
67
|
+
style="width: 18%"
|
|
68
|
+
/>
|
|
69
|
+
</template>
|
|
70
|
+
</div>
|
|
75
71
|
</el-form>
|
|
76
72
|
|
|
77
73
|
<div class="text-c">
|
|
@@ -1,7 +1,14 @@
|
|
|
1
1
|
<template>
|
|
2
|
-
<div class="
|
|
3
|
-
<
|
|
4
|
-
|
|
2
|
+
<div class="approve-msg-slt">
|
|
3
|
+
<el-select
|
|
4
|
+
v-model="approveMsgSlt"
|
|
5
|
+
class="w-100p"
|
|
6
|
+
clearable
|
|
7
|
+
multiple
|
|
8
|
+
collapse-tags
|
|
9
|
+
placeholder="请选择审批意见"
|
|
10
|
+
@change="changeFn"
|
|
11
|
+
>
|
|
5
12
|
<el-option v-for="(item, i) in approveMsgList" :key="i" :label="item.suggestion" :value="item.suggestion" />
|
|
6
13
|
</el-select>
|
|
7
14
|
</div>
|
|
@@ -32,7 +39,7 @@ export default {
|
|
|
32
39
|
},
|
|
33
40
|
methods: {
|
|
34
41
|
getData() {
|
|
35
|
-
axios.post('/bems/activiti/actAppOpi/
|
|
42
|
+
axios.post('/bems/activiti/actAppOpi/queryAppOpiAndUser').then(({ data }) => {
|
|
36
43
|
this.approveMsgList = data.list || []
|
|
37
44
|
})
|
|
38
45
|
},
|
|
@@ -45,4 +52,11 @@ export default {
|
|
|
45
52
|
}
|
|
46
53
|
</script>
|
|
47
54
|
|
|
48
|
-
<style
|
|
55
|
+
<style>
|
|
56
|
+
.approve-msg-slt .el-select__tags {
|
|
57
|
+
flex-wrap: nowrap;
|
|
58
|
+
}
|
|
59
|
+
.approve-msg-slt .el-tag {
|
|
60
|
+
max-width: calc(100% - 36px);
|
|
61
|
+
}
|
|
62
|
+
</style>
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<div class="flex-box">
|
|
3
|
-
<span class="
|
|
3
|
+
<span class="p-t-s m-r-s">{{ otherattname || '--' }}</span>
|
|
4
4
|
<el-select v-model="otherattvalue" class="flex-item" clearable @change="changeFn">
|
|
5
5
|
<el-option v-for="(item, i) in otherattjson" :key="i" :label="item.name" :value="item.value" />
|
|
6
6
|
</el-select>
|