cloud-web-corejs 1.0.54-dev.83 → 1.0.54-dev.85
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/excelExport/mixins.js +1 -2
- package/src/components/xform/form-designer/form-widget/dialog/importDialog.vue +27 -6
- package/src/components/xform/form-designer/form-widget/dialog/importDialogMixin.js +1 -1
- package/src/components/xform/form-designer/setting-panel/property-editor/wfFlag-editor.vue +103 -18
- package/src/components/xform/form-render/container-item/data-table-mixin.js +1 -1873
- package/src/components/xform/form-render/indexMixin.js +1 -1
- package/src/store/config/index.js +1 -598
- package/src/utils/request.js +1 -1
- package/src/views/user/company_info/dialog.vue +2 -1
- package/src/views/user/home/dev.vue +29 -0
- package/src/views/user/home/index.vue +11 -5
- package/src/views/user/user/info.vue +21 -91
- package/src/views/user/wf/wf_obj_config/list.vue +1 -13
|
@@ -7,12 +7,12 @@
|
|
|
7
7
|
:visible.sync="showDialog"
|
|
8
8
|
:modal="falseValue"
|
|
9
9
|
custom-class="dialog-style list-dialog demo-sty_2"
|
|
10
|
-
width="
|
|
10
|
+
width="500px"
|
|
11
11
|
@close="dialogClose"
|
|
12
12
|
v-el-drag-dialog
|
|
13
13
|
v-el-dialog-center
|
|
14
14
|
>
|
|
15
|
-
<div id="containt">
|
|
15
|
+
<div id="containt" style="height: 300px">
|
|
16
16
|
<div class="detail-wrap">
|
|
17
17
|
<el-form ref="editForm" :model="user">
|
|
18
18
|
<div class="d-header clearfix">
|
|
@@ -29,7 +29,7 @@
|
|
|
29
29
|
</div>
|
|
30
30
|
</div>
|
|
31
31
|
<div class="d-cont" style="height: auto">
|
|
32
|
-
<div class="d-item">
|
|
32
|
+
<div class="d-item" style="padding-right: 0">
|
|
33
33
|
<div class="title first"><b>{{ $t1('基本信息') }}</b></div>
|
|
34
34
|
<table class="table-detail">
|
|
35
35
|
<tbody>
|
|
@@ -38,41 +38,25 @@
|
|
|
38
38
|
<em class="f-red">*</em>
|
|
39
39
|
{{ $t1('登录名') }}
|
|
40
40
|
</th>
|
|
41
|
-
<td>
|
|
42
|
-
|
|
43
|
-
<template v-if="dataId">
|
|
44
|
-
<el-input
|
|
45
|
-
size="small"
|
|
46
|
-
v-model="user.loginAccount"
|
|
47
|
-
maxlength="255"
|
|
48
|
-
autocomplete="off"
|
|
49
|
-
lay-verify="required"
|
|
50
|
-
required=""
|
|
51
|
-
:readonly="true"
|
|
52
|
-
/>
|
|
53
|
-
</template>
|
|
54
|
-
<template v-else>
|
|
55
|
-
<el-input
|
|
56
|
-
size="small"
|
|
57
|
-
v-model="user.loginAccount"
|
|
58
|
-
maxlength="255"
|
|
59
|
-
autocomplete="off"
|
|
60
|
-
lay-verify="required"
|
|
61
|
-
required=""
|
|
62
|
-
clearable
|
|
63
|
-
/>
|
|
64
|
-
</template>
|
|
65
|
-
</el-form-item>
|
|
41
|
+
<td colspan="3">
|
|
42
|
+
{{ user.loginAccount }}
|
|
66
43
|
</td>
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
44
|
+
</tr>
|
|
45
|
+
<tr>
|
|
46
|
+
<th>
|
|
47
|
+
<em class="f-red">*</em>
|
|
48
|
+
{{ $t1('姓名') }}
|
|
49
|
+
</th>
|
|
50
|
+
<td colspan="3">
|
|
51
|
+
<el-form-item prop="nickName" :rules="[{ required: true, trigger: 'blur' }]">
|
|
52
|
+
<el-input size="small" v-model="user.nickName" maxlength="200" lay-verify="required" required=""
|
|
53
|
+
clearable/>
|
|
72
54
|
</el-form-item>
|
|
73
55
|
</td>
|
|
56
|
+
</tr>
|
|
57
|
+
<tr>
|
|
74
58
|
<th>{{ $t1('密码') }}</th>
|
|
75
|
-
<td>
|
|
59
|
+
<td colspan="3">
|
|
76
60
|
<el-form-item prop="password" :rules="passRules">
|
|
77
61
|
<el-input
|
|
78
62
|
size="small"
|
|
@@ -86,8 +70,10 @@
|
|
|
86
70
|
/>
|
|
87
71
|
</el-form-item>
|
|
88
72
|
</td>
|
|
73
|
+
</tr>
|
|
74
|
+
<tr>
|
|
89
75
|
<th>{{ $t1('确认密码') }}</th>
|
|
90
|
-
<td>
|
|
76
|
+
<td colspan="3">
|
|
91
77
|
<el-form-item prop="rePassword" :rules="pass2Rules">
|
|
92
78
|
<el-input
|
|
93
79
|
size="small"
|
|
@@ -103,62 +89,6 @@
|
|
|
103
89
|
</el-form-item>
|
|
104
90
|
</td>
|
|
105
91
|
</tr>
|
|
106
|
-
<tr>
|
|
107
|
-
<th>
|
|
108
|
-
<em class="f-red">*</em>
|
|
109
|
-
{{ $t1('姓名') }}
|
|
110
|
-
</th>
|
|
111
|
-
<td>
|
|
112
|
-
<el-form-item prop="nickName" :rules="[{ required: true, trigger: 'blur' }]">
|
|
113
|
-
<el-input size="small" v-model="user.nickName" maxlength="200" lay-verify="required" required=""
|
|
114
|
-
clearable/>
|
|
115
|
-
</el-form-item>
|
|
116
|
-
</td>
|
|
117
|
-
<th>{{ $t1('性别') }}</th>
|
|
118
|
-
<td>
|
|
119
|
-
<el-radio-group v-model="user.gender">
|
|
120
|
-
<el-radio :label="1">{{ $t1('男') }}</el-radio>
|
|
121
|
-
<el-radio :label="2">{{ $t1('女') }}</el-radio>
|
|
122
|
-
</el-radio-group>
|
|
123
|
-
</td>
|
|
124
|
-
<th>{{ $t1('出生日期') }}</th>
|
|
125
|
-
<td>
|
|
126
|
-
<el-date-picker size="small" v-model="user.birth" type="date" placeholder="选择日期"
|
|
127
|
-
value-format="yyyy-MM-dd" clearable/>
|
|
128
|
-
</td>
|
|
129
|
-
<th>{{ $t1('邮编') }}</th>
|
|
130
|
-
<td>
|
|
131
|
-
<el-input size="small" id="zipCode" v-model="user.zipCode" name="zipCode" maxlength="255"
|
|
132
|
-
clearable/>
|
|
133
|
-
</td>
|
|
134
|
-
</tr>
|
|
135
|
-
<tr>
|
|
136
|
-
<th>{{ $t1('地址') }}</th>
|
|
137
|
-
<td colspan="3">
|
|
138
|
-
<el-input size="small" v-model="user.address" class="b" maxlength="255" clearable/>
|
|
139
|
-
</td>
|
|
140
|
-
<th>{{ $t1('设置') }}</th>
|
|
141
|
-
<td colspan="3">
|
|
142
|
-
<el-checkbox label="是否启用" v-model="user.enabled"></el-checkbox>
|
|
143
|
-
</td>
|
|
144
|
-
</tr>
|
|
145
|
-
<tr>
|
|
146
|
-
<th>{{ $t1('头像') }}</th>
|
|
147
|
-
<td colspan="7">
|
|
148
|
-
<baseUpload :limit="1" accept="image/png, image/jpeg" multi="false" :file.sync="user.headPhotoUrl"
|
|
149
|
-
dataType="medium"></baseUpload>
|
|
150
|
-
</td>
|
|
151
|
-
</tr>
|
|
152
|
-
<tr>
|
|
153
|
-
<th>{{ $t1('创建人') }}</th>
|
|
154
|
-
<td>{{ user.createBy }}</td>
|
|
155
|
-
<th>{{ $t1('创建时间') }}</th>
|
|
156
|
-
<td>{{ user.createDate }}</td>
|
|
157
|
-
<th>{{ $t1('更新人') }}</th>
|
|
158
|
-
<td>{{ user.modifyBy }}</td>
|
|
159
|
-
<th>{{ $t1('更新时间') }}</th>
|
|
160
|
-
<td>{{ user.modifyDate }}</td>
|
|
161
|
-
</tr>
|
|
162
92
|
</tbody>
|
|
163
93
|
</table>
|
|
164
94
|
</div>
|
|
@@ -467,7 +467,7 @@ export default {
|
|
|
467
467
|
width: 200
|
|
468
468
|
},
|
|
469
469
|
{
|
|
470
|
-
width:
|
|
470
|
+
width: 100,
|
|
471
471
|
fixed: 'right',
|
|
472
472
|
sortable: false,
|
|
473
473
|
title: '',
|
|
@@ -497,18 +497,6 @@ export default {
|
|
|
497
497
|
popper-class="tooltip-skin">
|
|
498
498
|
<i class="iconfont icon-liuchengguanli-shejiqi_liucheng"/>
|
|
499
499
|
</el-tooltip>
|
|
500
|
-
</a>,
|
|
501
|
-
<a
|
|
502
|
-
href="javascript:void(0);"
|
|
503
|
-
onClick={() => {
|
|
504
|
-
this.openWfBizDataSettingDialog(row, this.currentRow.serviceId);
|
|
505
|
-
}}
|
|
506
|
-
class="a-link"
|
|
507
|
-
>
|
|
508
|
-
<el-tooltip enterable={false} effect="dark" content={this.$t1('过程更改业务数据')} placement="top"
|
|
509
|
-
popper-class="tooltip-skin">
|
|
510
|
-
<i class="el-icon-setting"/>
|
|
511
|
-
</el-tooltip>
|
|
512
500
|
</a>
|
|
513
501
|
];
|
|
514
502
|
}
|