cloud-web-corejs 1.0.54-dev.403 → 1.0.54-dev.405

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
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "cloud-web-corejs",
3
3
  "private": false,
4
- "version": "1.0.54-dev.403",
4
+ "version": "1.0.54-dev.405",
5
5
  "scripts": {
6
6
  "dev": "vue-cli-service serve",
7
7
  "lint": "eslint --ext .js,.vue src",
@@ -6,7 +6,7 @@
6
6
  v-model="formData.dateRange"
7
7
  @change="handleSelectChange"
8
8
  clearable
9
- style="width: 146px !important"
9
+ style="width: 128px !important"
10
10
  >
11
11
  <el-option :label="$t1('本日')" :value="1"></el-option>
12
12
  <el-option :label="$t1('本周')" :value="2"></el-option>
@@ -20,7 +20,7 @@
20
20
  clearable
21
21
  @clear="formData.stat = null"
22
22
  @change="handleSelectChange"
23
- style="width: 146px !important"
23
+ style="width: 128px !important"
24
24
  >
25
25
  <el-option
26
26
  :label="$t2('审核中', 'components.wf.wfStatus1')"
@@ -35,14 +35,13 @@
35
35
  :value="3"
36
36
  ></el-option>
37
37
  </el-select>
38
- <!-- <el-input v-model="formData.objTypeName" placeholder="流程类型"></el-input> -->
39
38
  <el-select
40
39
  class="f-btn"
41
40
  v-model="formData.objTypeCode"
42
41
  :placeholder="$t1('流程类型')"
43
42
  clearable
44
43
  @change="handleSelectChange"
45
- style="width: 146px !important"
44
+ style="width: 128px !important"
46
45
  >
47
46
  <el-option
48
47
  v-for="(item, index) in objTypeList"
@@ -54,7 +53,7 @@
54
53
  <el-input
55
54
  v-model="formData.name"
56
55
  placeholder="流程主题"
57
- style="width: 146px !important"
56
+ style="width: 128px !important"
58
57
  ></el-input>
59
58
  <span class="button-sty">
60
59
  <el-date-picker
@@ -65,7 +64,7 @@
65
64
  clearable
66
65
  value-format="yyyy-MM-dd"
67
66
  :picker-options="$baseStartPickerOptions(formData.endStartTime)"
68
- style="width: 146px !important"
67
+ style="width: 128px !important"
69
68
  ></el-date-picker>
70
69
  <span>-</span>
71
70
  <el-date-picker
@@ -76,7 +75,7 @@
76
75
  clearable
77
76
  value-format="yyyy-MM-dd"
78
77
  :picker-options="$baseEndPickerOptions(formData.startStartTime)"
79
- style="width: 146px !important"
78
+ style="width: 128px !important"
80
79
  ></el-date-picker>
81
80
  </span>
82
81
  <span class="button-sty">
@@ -88,7 +87,7 @@
88
87
  clearable
89
88
  value-format="yyyy-MM-dd"
90
89
  :picker-options="$baseStartPickerOptions(formData.endEndTime)"
91
- style="width: 146px !important"
90
+ style="width: 128px !important"
92
91
  ></el-date-picker>
93
92
  <span>-</span>
94
93
  <el-date-picker
@@ -99,9 +98,18 @@
99
98
  clearable
100
99
  value-format="yyyy-MM-dd"
101
100
  :picker-options="$baseEndPickerOptions(formData.startEndTime)"
102
- style="width: 146px !important"
101
+ style="width: 128px !important"
103
102
  ></el-date-picker>
104
103
  </span>
104
+ <el-button
105
+ type="primary"
106
+ plain
107
+ class="button-sty"
108
+ @click="resetEvent"
109
+ icon="el-icon-brush"
110
+ >
111
+ {{ $t1("重置") }}
112
+ </el-button>
105
113
  <el-button
106
114
  type="warning"
107
115
  size="small"
@@ -150,7 +158,29 @@
150
158
  <span>流程详情列表</span>
151
159
  </div>
152
160
  <div style="height: 100%">
153
- <vxe-grid ref="table-m1" v-bind="vxeOption" :data="tableData"> </vxe-grid>
161
+ <vxe-grid ref="table-m1" v-bind="vxeOption" :data="tableData">
162
+ <template #form>
163
+ <div class="clearfix screen-btns">
164
+ <div class="fl">
165
+ <base-table-export
166
+ :option="{
167
+ title: $t1('流程处理耗用时间查询'),
168
+ targetRef: 'table-m1',
169
+ }"
170
+ :parent-target="_self"
171
+ />
172
+ </div>
173
+ <div class="fr">
174
+ <!-- <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
175
+ plain>{{ $t1('重置') }}
176
+ </vxe-button>
177
+ <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">
178
+ {{ $t1('搜索') }}
179
+ </vxe-button> -->
180
+ </div>
181
+ </div>
182
+ </template>
183
+ </vxe-grid>
154
184
  </div>
155
185
  </el-card>
156
186
  </el-col>
@@ -195,14 +225,23 @@
195
225
  </el-card>
196
226
  </el-col>
197
227
  </el-row>
228
+ <wfContentDialog
229
+ v-if="showWfDialog"
230
+ :visible.sync="showWfDialog"
231
+ :option.sync="wfContentOption"
232
+ ></wfContentDialog>
198
233
  </div>
199
234
  </template>
200
235
 
201
236
  <script>
202
237
  import scriptHttpMixin from "@base/components/xform/mixins/scriptHttp";
238
+ import wfContentDialog from "@base/views/user/wf/wf_manage/wfContentDialog";
203
239
  export default {
204
240
  name: "wf_report:index",
205
241
  mixins: [scriptHttpMixin],
242
+ components: {
243
+ wfContentDialog,
244
+ },
206
245
  data() {
207
246
  return {
208
247
  vxeOption: {},
@@ -251,6 +290,9 @@ export default {
251
290
  stat: null,
252
291
  },
253
292
  objTypeList: [],
293
+
294
+ showWfDialog: false,
295
+ wfContentOption: {},
254
296
  };
255
297
  },
256
298
  mounted() {
@@ -259,9 +301,21 @@ export default {
259
301
  this.loadWfSummaryCount();
260
302
  },
261
303
  methods: {
304
+ openWfDialog(row) {
305
+ this.wfContentOption = {
306
+ objId: row.obj_id,
307
+ url: row.url,
308
+ objTypeCode: row.obj_type_code,
309
+ };
310
+ this.showWfDialog = true;
311
+ },
262
312
  searchEvent() {
263
313
  this.$refs["table-m1"].commitProxy("reload");
264
314
  },
315
+ resetEvent() {
316
+ this.formData = {};
317
+ this.$refs["table-m1"].commitProxy("reload");
318
+ },
265
319
  initTableList() {
266
320
  let that = this;
267
321
  let formCode = this.$route.query.formCode;
@@ -358,7 +412,7 @@ export default {
358
412
  { field: "approver_num", title: "审批总人数", width: 180 },
359
413
  { field: "node_num", title: "审批节点数量", width: 180 },
360
414
  {
361
- width: 47,
415
+ width: 90,
362
416
  fixed: "right",
363
417
  title: "",
364
418
  sortable: false,
@@ -382,6 +436,23 @@ export default {
382
436
  <i class="iconfont icon-dianji" />
383
437
  </el-tooltip>
384
438
  </a>,
439
+ <a
440
+ href="javascript:void(0);"
441
+ class="a-link"
442
+ onclick={() => {
443
+ this.openWfDialog(row);
444
+ }}
445
+ >
446
+ <el-tooltip
447
+ enterable={false}
448
+ effect="dark"
449
+ content={this.$t1("查看")}
450
+ placement="top"
451
+ popper-class="tooltip-skin"
452
+ >
453
+ <i class="el-icon-edit" />
454
+ </el-tooltip>
455
+ </a>,
385
456
  ];
386
457
  },
387
458
  },
@@ -455,7 +526,7 @@ export default {
455
526
  }
456
527
  .filter-btns {
457
528
  .f-btn {
458
- margin-right: 10px;
529
+ margin-right: 25px;
459
530
  }
460
531
  }
461
532
  .sum-statistics {