cloud-web-corejs 1.0.54-dev.639 → 1.0.54-dev.640
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.
|
@@ -49,7 +49,10 @@
|
|
|
49
49
|
<div class="clearfix screen-btns">
|
|
50
50
|
<div class="fl">
|
|
51
51
|
<base-table-export
|
|
52
|
-
:option="{
|
|
52
|
+
:option="{
|
|
53
|
+
title: $t1('流程待办导出'),
|
|
54
|
+
targetRef: 'table-m1',
|
|
55
|
+
}"
|
|
53
56
|
:parent-target="_self"
|
|
54
57
|
/>
|
|
55
58
|
</div>
|
|
@@ -84,15 +87,26 @@
|
|
|
84
87
|
>
|
|
85
88
|
<vxe-form-item :title="$t1('待办类型') + ':'">
|
|
86
89
|
<template v-slot>
|
|
87
|
-
<el-input
|
|
90
|
+
<el-input
|
|
91
|
+
v-model="checkNodeData.label"
|
|
92
|
+
size="small"
|
|
93
|
+
disabled
|
|
94
|
+
/>
|
|
88
95
|
</template>
|
|
89
96
|
</vxe-form-item>
|
|
90
97
|
<vxe-form-item :title="$t1('流程主题') + ':'" field="name">
|
|
91
98
|
<template v-slot>
|
|
92
|
-
<el-input
|
|
99
|
+
<el-input
|
|
100
|
+
v-model="formData.name"
|
|
101
|
+
size="small"
|
|
102
|
+
clearable
|
|
103
|
+
/>
|
|
93
104
|
</template>
|
|
94
105
|
</vxe-form-item>
|
|
95
|
-
<vxe-form-item
|
|
106
|
+
<vxe-form-item
|
|
107
|
+
:title="$t1('单据类型') + ':'"
|
|
108
|
+
field="objTypeName"
|
|
109
|
+
>
|
|
96
110
|
<template v-slot>
|
|
97
111
|
<el-input
|
|
98
112
|
class="search-input"
|
|
@@ -116,15 +130,31 @@
|
|
|
116
130
|
<vxe-form-item :title="$t1('流程状态') + ':'" field="stat">
|
|
117
131
|
<template v-slot>
|
|
118
132
|
<el-select v-model="formData.stat" clearable>
|
|
119
|
-
<el-option
|
|
120
|
-
|
|
121
|
-
|
|
133
|
+
<el-option
|
|
134
|
+
:value="1"
|
|
135
|
+
:label="$t1('审核中')"
|
|
136
|
+
></el-option>
|
|
137
|
+
<el-option
|
|
138
|
+
:value="2"
|
|
139
|
+
:label="$t1('已完成')"
|
|
140
|
+
></el-option>
|
|
141
|
+
<el-option
|
|
142
|
+
:value="3"
|
|
143
|
+
:label="$t1('已驳回')"
|
|
144
|
+
></el-option>
|
|
122
145
|
</el-select>
|
|
123
146
|
</template>
|
|
124
147
|
</vxe-form-item>
|
|
125
|
-
<vxe-form-item
|
|
148
|
+
<vxe-form-item
|
|
149
|
+
:title="$t1('启动人') + ':'"
|
|
150
|
+
field="starterName"
|
|
151
|
+
>
|
|
126
152
|
<template v-slot>
|
|
127
|
-
<el-input
|
|
153
|
+
<el-input
|
|
154
|
+
v-model="formData.starterName"
|
|
155
|
+
size="small"
|
|
156
|
+
clearable
|
|
157
|
+
/>
|
|
128
158
|
</template>
|
|
129
159
|
</vxe-form-item>
|
|
130
160
|
<vxe-form-item title="启动时间:">
|
|
@@ -136,7 +166,9 @@
|
|
|
136
166
|
size="small"
|
|
137
167
|
clearable
|
|
138
168
|
value-format="yyyy-MM-dd HH:mm:ss"
|
|
139
|
-
:picker-options="
|
|
169
|
+
:picker-options="
|
|
170
|
+
$baseStartPickerOptions(formData.endTime)
|
|
171
|
+
"
|
|
140
172
|
></el-date-picker>
|
|
141
173
|
<span>-</span>
|
|
142
174
|
<el-date-picker
|
|
@@ -147,7 +179,9 @@
|
|
|
147
179
|
clearable
|
|
148
180
|
value-format="yyyy-MM-dd HH:mm:ss"
|
|
149
181
|
default-time="23:59:59"
|
|
150
|
-
:picker-options="
|
|
182
|
+
:picker-options="
|
|
183
|
+
$baseEndPickerOptions(formData.startTime)
|
|
184
|
+
"
|
|
151
185
|
></el-date-picker>
|
|
152
186
|
</template>
|
|
153
187
|
</vxe-form-item>
|
|
@@ -169,7 +203,10 @@
|
|
|
169
203
|
<div class="clearfix screen-btns">
|
|
170
204
|
<div class="fl">
|
|
171
205
|
<base-table-export
|
|
172
|
-
:option="{
|
|
206
|
+
:option="{
|
|
207
|
+
title: $t1('流程待办导出'),
|
|
208
|
+
targetRef: 'table-m2',
|
|
209
|
+
}"
|
|
173
210
|
:parent-target="_self"
|
|
174
211
|
/>
|
|
175
212
|
</div>
|
|
@@ -207,7 +244,10 @@
|
|
|
207
244
|
<el-input v-model="formData2.name" size="small" clearable />
|
|
208
245
|
</template>
|
|
209
246
|
</vxe-form-item>
|
|
210
|
-
<vxe-form-item
|
|
247
|
+
<vxe-form-item
|
|
248
|
+
:title="$t1('单据类型') + ':'"
|
|
249
|
+
field="objTypeName"
|
|
250
|
+
>
|
|
211
251
|
<template v-slot>
|
|
212
252
|
<el-input
|
|
213
253
|
class="search-input"
|
|
@@ -237,9 +277,16 @@
|
|
|
237
277
|
</el-select>
|
|
238
278
|
</template>
|
|
239
279
|
</vxe-form-item>
|
|
240
|
-
<vxe-form-item
|
|
280
|
+
<vxe-form-item
|
|
281
|
+
:title="$t1('当前任务用户') + ':'"
|
|
282
|
+
field="candidateNames"
|
|
283
|
+
>
|
|
241
284
|
<template v-slot>
|
|
242
|
-
<el-input
|
|
285
|
+
<el-input
|
|
286
|
+
v-model="formData2.candidateNames"
|
|
287
|
+
size="small"
|
|
288
|
+
clearable
|
|
289
|
+
/>
|
|
243
290
|
</template>
|
|
244
291
|
</vxe-form-item>
|
|
245
292
|
</vxe-form>
|
|
@@ -269,7 +316,7 @@ import { treeScollx } from "@base/utils/global.js";
|
|
|
269
316
|
import wfObjConfigDialog from "../wf_obj_config/dialog.vue";
|
|
270
317
|
|
|
271
318
|
export default {
|
|
272
|
-
name: "wf_manage:
|
|
319
|
+
name: "wf_manage:list2",
|
|
273
320
|
components: { wfObjConfigDialog },
|
|
274
321
|
created() {},
|
|
275
322
|
async mounted() {
|
|
@@ -305,7 +352,9 @@ export default {
|
|
|
305
352
|
},
|
|
306
353
|
computed: {
|
|
307
354
|
type() {
|
|
308
|
-
return this.checkNode && this.checkNode.data
|
|
355
|
+
return this.checkNode && this.checkNode.data
|
|
356
|
+
? this.checkNode.data.type
|
|
357
|
+
: "";
|
|
309
358
|
},
|
|
310
359
|
checkNodeData() {
|
|
311
360
|
return this.checkNode && this.checkNode.data ? this.checkNode.data : {};
|
|
@@ -500,11 +549,14 @@ export default {
|
|
|
500
549
|
this.$openEditView("showWfContent");
|
|
501
550
|
},
|
|
502
551
|
guid() {
|
|
503
|
-
return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(
|
|
504
|
-
|
|
505
|
-
|
|
506
|
-
|
|
507
|
-
|
|
552
|
+
return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(
|
|
553
|
+
/[xy]/g,
|
|
554
|
+
function (c) {
|
|
555
|
+
var r = (Math.random() * 16) | 0,
|
|
556
|
+
v = c == "x" ? r : (r & 0x3) | 0x8;
|
|
557
|
+
return v.toString(16);
|
|
558
|
+
}
|
|
559
|
+
);
|
|
508
560
|
},
|
|
509
561
|
clearNodeClick() {
|
|
510
562
|
/* this.formData.saleOrgId = '';
|