cloud-web-corejs 1.0.54-dev.317 → 1.0.54-dev.319
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 +1 -1
- package/src/components/wf/{add0pinionButton.vue → addOpinionButton.vue} +9 -7
- package/src/components/wf/content.vue +2 -2
- package/src/components/wf/wf.js +44 -1
- package/src/views/bd/setting/request_async_setting/edit.vue +41 -0
- package/src/views/bd/setting/request_async_setting/list.vue +20 -0
- package/src/views/bd/setting/request_setting/edit.vue +54 -12
- package/src/views/bd/setting/request_setting/list.vue +20 -0
package/package.json
CHANGED
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
wfInfo.taskName
|
|
19
19
|
}}</b></span>
|
|
20
20
|
</template>
|
|
21
|
-
<el-form :model="formData">
|
|
21
|
+
<el-form ref="form" :model="formData">
|
|
22
22
|
<div id="containt">
|
|
23
23
|
<table class="table-detail">
|
|
24
24
|
<tbody>
|
|
@@ -54,9 +54,11 @@
|
|
|
54
54
|
<script>
|
|
55
55
|
export default {
|
|
56
56
|
props: {
|
|
57
|
-
|
|
57
|
+
wfSendTaskId: String,
|
|
58
|
+
wfInfo: Object,
|
|
59
|
+
current_prefix:String
|
|
58
60
|
},
|
|
59
|
-
inject:
|
|
61
|
+
inject:['getEditVueTarget'],
|
|
60
62
|
data() {
|
|
61
63
|
return {
|
|
62
64
|
formData: {
|
|
@@ -72,13 +74,13 @@ export default {
|
|
|
72
74
|
confirmDialog(){
|
|
73
75
|
this.$refs.form.$baseValidate((valid) => {
|
|
74
76
|
if (valid) {
|
|
75
|
-
let that =
|
|
76
|
-
let taskId = this.
|
|
77
|
+
let that = this.getEditVueTarget();
|
|
78
|
+
let taskId = this.wfSendTaskId;
|
|
77
79
|
let formData = {
|
|
78
80
|
opinion: this.formData.opinion,
|
|
79
81
|
taskId: taskId
|
|
80
82
|
}
|
|
81
|
-
return
|
|
83
|
+
return that.$http({
|
|
82
84
|
url: this.current_prefix + "/wf/addOpinion",
|
|
83
85
|
method: `post`,
|
|
84
86
|
data: formData,
|
|
@@ -86,7 +88,7 @@ export default {
|
|
|
86
88
|
modalStrictly: true,
|
|
87
89
|
success: (res) => {
|
|
88
90
|
that.$message({
|
|
89
|
-
message:
|
|
91
|
+
message: res.content,
|
|
90
92
|
type: "success",
|
|
91
93
|
duration: 1000,
|
|
92
94
|
});
|
|
@@ -38,7 +38,7 @@
|
|
|
38
38
|
v-show="wfInfo.toRevoke"
|
|
39
39
|
icon="el-icon-document-delete">{{ $t2('撤回', 'components.wf.revoke') }}
|
|
40
40
|
</el-button>
|
|
41
|
-
<
|
|
41
|
+
<addOpinionButton v-if="showAddOpinionButton" @confirm="reloadContent()" :wfInfo="wfInfo" :wfSendTaskId="wfSendTaskId" :current_prefix="current_prefix"></addOpinionButton>
|
|
42
42
|
</div>
|
|
43
43
|
<div class="title-name">
|
|
44
44
|
<b>
|
|
@@ -805,7 +805,7 @@ export default {
|
|
|
805
805
|
addTaskUserdialog: () => import('./addTaskUserdialog'),
|
|
806
806
|
setCandidateDialog: () => import('./setCandidateDialog'),
|
|
807
807
|
setCandidateButton: () => import('./setCandidateButton'),
|
|
808
|
-
|
|
808
|
+
addOpinionButton: () => import('./addOpinionButton'),
|
|
809
809
|
},
|
|
810
810
|
mixins: [wfContentMixin]
|
|
811
811
|
};
|
package/src/components/wf/wf.js
CHANGED
|
@@ -379,6 +379,11 @@ wfContentMixin = {
|
|
|
379
379
|
showCandidate: false,
|
|
380
380
|
candidateOption:{},
|
|
381
381
|
candidateDatas:[],
|
|
382
|
+
wfSendTaskId: null,
|
|
383
|
+
showAddOpinionButton: false,
|
|
384
|
+
|
|
385
|
+
addOpinionEnabled: false,
|
|
386
|
+
modifyCurrentCandidateEnabled: false,
|
|
382
387
|
};
|
|
383
388
|
},
|
|
384
389
|
provide() {
|
|
@@ -399,12 +404,42 @@ wfContentMixin = {
|
|
|
399
404
|
this.initForAll();
|
|
400
405
|
},
|
|
401
406
|
methods: {
|
|
407
|
+
initWfParam13(){
|
|
408
|
+
//初始化补充意见权限
|
|
409
|
+
let that = getTarget(this);
|
|
410
|
+
return that.$http({
|
|
411
|
+
url: USER_PREFIX + "/wf_diy_attribute/getValue",
|
|
412
|
+
method: `post`,
|
|
413
|
+
data: {attributeKey: "param13"},
|
|
414
|
+
success: (res) => {
|
|
415
|
+
this.addOpinionEnabled = res?.objx === true;
|
|
416
|
+
if(this.addOpinionEnabled){
|
|
417
|
+
this.wfSendTaskId = this.getViewParam('wfSendTaskId');
|
|
418
|
+
this.showAddOpinionButton = !!this.wfSendTaskId;
|
|
419
|
+
}
|
|
420
|
+
},
|
|
421
|
+
});
|
|
422
|
+
},
|
|
423
|
+
|
|
424
|
+
initWfParam14(){
|
|
425
|
+
//初始化修改当前候选人权限
|
|
426
|
+
let that = getTarget(this);
|
|
427
|
+
return that.$http({
|
|
428
|
+
url: USER_PREFIX + "/wf_diy_attribute/getValue",
|
|
429
|
+
method: `post`,
|
|
430
|
+
data: {attributeKey: "param14"},
|
|
431
|
+
success: (res) => {
|
|
432
|
+
this.modifyCurrentCandidateEnabled = res?.objx === true;
|
|
433
|
+
},
|
|
434
|
+
});
|
|
435
|
+
},
|
|
402
436
|
getViewParam(key){
|
|
403
437
|
let that = this.viewTarget;
|
|
404
438
|
let value = that[key] || that.$attrs[key];
|
|
405
439
|
return value;
|
|
406
440
|
},
|
|
407
441
|
initCandidate(){
|
|
442
|
+
// 是否显示"节点候选人"选项卡
|
|
408
443
|
let that = getTarget(this);
|
|
409
444
|
that.$http({
|
|
410
445
|
url: USER_PREFIX + "/wf_diy_attribute/getValue",
|
|
@@ -499,9 +534,17 @@ wfContentMixin = {
|
|
|
499
534
|
this.initWfUserParam();
|
|
500
535
|
this.initTabIndex();
|
|
501
536
|
this.initShowTaskInfo();
|
|
537
|
+
//初始化附言
|
|
502
538
|
this.getIsShowWfMemo();
|
|
539
|
+
// 是否显示"节点候选人"选项卡
|
|
503
540
|
this.initCandidate()
|
|
504
|
-
|
|
541
|
+
|
|
542
|
+
//初始化补充意见权限
|
|
543
|
+
this.initWfParam13();
|
|
544
|
+
|
|
545
|
+
//初始化修改当前候选人权限
|
|
546
|
+
this.initWfParam14();
|
|
547
|
+
|
|
505
548
|
}
|
|
506
549
|
});
|
|
507
550
|
},
|
|
@@ -101,6 +101,46 @@
|
|
|
101
101
|
</el-form-item>
|
|
102
102
|
</td>
|
|
103
103
|
</tr>
|
|
104
|
+
<tr>
|
|
105
|
+
<th>
|
|
106
|
+
{{ $t1('参数1') }}
|
|
107
|
+
</th>
|
|
108
|
+
<td colspan="7">
|
|
109
|
+
<el-form-item prop="param1" :rules="[{ required: false, trigger: 'blur' }]">
|
|
110
|
+
<el-input type="text" autocomplete="off" v-model="requestAsyncSetting.param1" clearable/>
|
|
111
|
+
</el-form-item>
|
|
112
|
+
</td>
|
|
113
|
+
</tr>
|
|
114
|
+
<tr>
|
|
115
|
+
<th>
|
|
116
|
+
{{ $t1('参数2') }}
|
|
117
|
+
</th>
|
|
118
|
+
<td colspan="7">
|
|
119
|
+
<el-form-item prop="param2" :rules="[{ required: false, trigger: 'blur' }]">
|
|
120
|
+
<el-input type="text" autocomplete="off" v-model="requestAsyncSetting.param2" clearable/>
|
|
121
|
+
</el-form-item>
|
|
122
|
+
</td>
|
|
123
|
+
</tr>
|
|
124
|
+
<tr>
|
|
125
|
+
<th>
|
|
126
|
+
{{ $t1('参数3') }}
|
|
127
|
+
</th>
|
|
128
|
+
<td colspan="7">
|
|
129
|
+
<el-form-item prop="param3" :rules="[{ required: false, trigger: 'blur' }]">
|
|
130
|
+
<el-input type="text" autocomplete="off" v-model="requestAsyncSetting.param3" clearable/>
|
|
131
|
+
</el-form-item>
|
|
132
|
+
</td>
|
|
133
|
+
</tr>
|
|
134
|
+
<tr>
|
|
135
|
+
<th>
|
|
136
|
+
{{ $t1('参数4') }}
|
|
137
|
+
</th>
|
|
138
|
+
<td colspan="7">
|
|
139
|
+
<el-form-item prop="param1" :rules="[{ required: false, trigger: 'blur' }]">
|
|
140
|
+
<el-input type="text" autocomplete="off" v-model="requestAsyncSetting.param4" clearable/>
|
|
141
|
+
</el-form-item>
|
|
142
|
+
</td>
|
|
143
|
+
</tr>
|
|
104
144
|
|
|
105
145
|
<tr>
|
|
106
146
|
<th>{{ $t1('创建人') }}</th>
|
|
@@ -124,6 +164,7 @@
|
|
|
124
164
|
<tr>
|
|
125
165
|
<th>
|
|
126
166
|
{{ $t1('脚本') }}
|
|
167
|
+
<scriptDescriptionButton path="static/readme/RequestAsyncSetting.txt"></scriptDescriptionButton>
|
|
127
168
|
<scriptTestButton :script.sync="requestAsyncSetting.script"></scriptTestButton>
|
|
128
169
|
</th>
|
|
129
170
|
<td colspan="7">
|
|
@@ -232,6 +232,26 @@ export default {
|
|
|
232
232
|
}
|
|
233
233
|
}
|
|
234
234
|
},
|
|
235
|
+
{
|
|
236
|
+
title: '参数1',
|
|
237
|
+
field: 'param1',
|
|
238
|
+
width: 150
|
|
239
|
+
},
|
|
240
|
+
{
|
|
241
|
+
title: '参数2',
|
|
242
|
+
field: 'param2',
|
|
243
|
+
width: 150
|
|
244
|
+
},
|
|
245
|
+
{
|
|
246
|
+
title: '参数3',
|
|
247
|
+
field: 'param3',
|
|
248
|
+
width: 150
|
|
249
|
+
},
|
|
250
|
+
{
|
|
251
|
+
title: '参数4',
|
|
252
|
+
field: 'param4',
|
|
253
|
+
width: 150
|
|
254
|
+
},
|
|
235
255
|
{
|
|
236
256
|
field: 'createBy',
|
|
237
257
|
title: this.$t1('创建人'),
|
|
@@ -122,21 +122,63 @@
|
|
|
122
122
|
</el-form-item>
|
|
123
123
|
</td>
|
|
124
124
|
</tr>
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
125
|
+
<tr>
|
|
126
|
+
<th>
|
|
127
|
+
{{ $t1('参数1') }}
|
|
128
|
+
</th>
|
|
129
|
+
<td colspan="7">
|
|
130
|
+
<el-form-item prop="param1" :rules="[{ required: false, trigger: 'blur' }]">
|
|
131
|
+
<el-input type="text" autocomplete="off" v-model="requestSetting.param1" clearable/>
|
|
132
|
+
</el-form-item>
|
|
133
|
+
</td>
|
|
134
|
+
</tr>
|
|
135
|
+
<tr>
|
|
136
|
+
<th>
|
|
137
|
+
{{ $t1('参数2') }}
|
|
138
|
+
</th>
|
|
139
|
+
<td colspan="7">
|
|
140
|
+
<el-form-item prop="param2" :rules="[{ required: false, trigger: 'blur' }]">
|
|
141
|
+
<el-input type="text" autocomplete="off" v-model="requestSetting.param2" clearable/>
|
|
142
|
+
</el-form-item>
|
|
143
|
+
</td>
|
|
144
|
+
</tr>
|
|
145
|
+
<tr>
|
|
146
|
+
<th>
|
|
147
|
+
{{ $t1('参数3') }}
|
|
148
|
+
</th>
|
|
149
|
+
<td colspan="7">
|
|
150
|
+
<el-form-item prop="param3" :rules="[{ required: false, trigger: 'blur' }]">
|
|
151
|
+
<el-input type="text" autocomplete="off" v-model="requestSetting.param3" clearable/>
|
|
152
|
+
</el-form-item>
|
|
153
|
+
</td>
|
|
154
|
+
</tr>
|
|
155
|
+
<tr>
|
|
156
|
+
<th>
|
|
157
|
+
{{ $t1('参数4') }}
|
|
158
|
+
</th>
|
|
159
|
+
<td colspan="7">
|
|
160
|
+
<el-form-item prop="param1" :rules="[{ required: false, trigger: 'blur' }]">
|
|
161
|
+
<el-input type="text" autocomplete="off" v-model="requestSetting.param4" clearable/>
|
|
162
|
+
</el-form-item>
|
|
163
|
+
</td>
|
|
164
|
+
</tr>
|
|
165
|
+
<tr>
|
|
166
|
+
<th>
|
|
167
|
+
{{ $t1('前置脚本') }}
|
|
168
|
+
<scriptDescriptionButton path="static/readme/RequestSetting.txt"></scriptDescriptionButton>
|
|
169
|
+
<scriptTestButton :script.sync="requestSetting.preScript"></scriptTestButton>
|
|
170
|
+
</th>
|
|
171
|
+
<td colspan="7">
|
|
172
|
+
<el-form-item prop="preScript" :rules="[{ required: false, trigger: 'blur' }]">
|
|
173
|
+
<code-editor mode="java" :readonly="!1" v-model="requestSetting.preScript"
|
|
174
|
+
v-if="showCodeEditor"></code-editor>
|
|
175
|
+
</el-form-item>
|
|
176
|
+
</td>
|
|
177
|
+
</tr>
|
|
137
178
|
<tr>
|
|
138
179
|
<th>
|
|
139
180
|
{{ $t1('后置脚本') }}
|
|
181
|
+
<scriptDescriptionButton path="static/readme/RequestSetting.txt"></scriptDescriptionButton>
|
|
140
182
|
<scriptTestButton :script.sync="requestSetting.postScript"></scriptTestButton>
|
|
141
183
|
</th>
|
|
142
184
|
<td colspan="7">
|
|
@@ -191,6 +191,26 @@ export default {
|
|
|
191
191
|
}
|
|
192
192
|
}
|
|
193
193
|
},
|
|
194
|
+
{
|
|
195
|
+
title: '参数1',
|
|
196
|
+
field: 'param1',
|
|
197
|
+
width: 150
|
|
198
|
+
},
|
|
199
|
+
{
|
|
200
|
+
title: '参数2',
|
|
201
|
+
field: 'param2',
|
|
202
|
+
width: 150
|
|
203
|
+
},
|
|
204
|
+
{
|
|
205
|
+
title: '参数3',
|
|
206
|
+
field: 'param3',
|
|
207
|
+
width: 150
|
|
208
|
+
},
|
|
209
|
+
{
|
|
210
|
+
title: '参数4',
|
|
211
|
+
field: 'param4',
|
|
212
|
+
width: 150
|
|
213
|
+
},
|
|
194
214
|
{
|
|
195
215
|
field: 'createBy',
|
|
196
216
|
title: this.$t1('创建人'),
|