cloud-web-corejs 1.0.54-dev.84 → 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/xform/form-designer/form-widget/dialog/importDialog.vue +2 -2
- package/src/components/xform/form-designer/setting-panel/property-editor/wfFlag-editor.vue +103 -18
- package/src/views/user/company_info/dialog.vue +2 -1
- package/src/views/user/user/info.vue +21 -62
- package/src/views/user/user/infoEdit.vue +25 -12
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
<div v-if="showContent">
|
|
3
3
|
<el-dialog
|
|
4
4
|
:title="$t2('导入', 'components.excelImport.title')"
|
|
5
|
-
:append-to-body="
|
|
5
|
+
:append-to-body="true"
|
|
6
6
|
:modal-append-to-body="falseValue"
|
|
7
7
|
:close-on-click-modal="falseValue"
|
|
8
8
|
:visible.sync="showImportDialog"
|
|
@@ -55,7 +55,7 @@
|
|
|
55
55
|
<el-dialog
|
|
56
56
|
ref="importDialog"
|
|
57
57
|
:title="$t2('导入', 'components.excelImport.title')"
|
|
58
|
-
:append-to-body="
|
|
58
|
+
:append-to-body="true"
|
|
59
59
|
:modal-append-to-body="falseValue"
|
|
60
60
|
:close-on-click-modal="falseValue"
|
|
61
61
|
:visible.sync="showImportDialog2"
|
|
@@ -41,24 +41,66 @@
|
|
|
41
41
|
stripe=""
|
|
42
42
|
>
|
|
43
43
|
<el-table-column type="index" width="35" fixed="left"></el-table-column>
|
|
44
|
-
<el-table-column :label="i18nt('
|
|
45
|
-
<template slot-scope="
|
|
46
|
-
<el-select v-model="
|
|
47
|
-
<el-option
|
|
48
|
-
|
|
44
|
+
<el-table-column :label="i18nt('服务')" width="150">
|
|
45
|
+
<template slot-scope="{row}">
|
|
46
|
+
<el-select v-model="row.serveType" @change="changeServeType(row)">
|
|
47
|
+
<el-option :value="1" label="正式"></el-option>
|
|
48
|
+
<el-option :value="2" label="UAT"></el-option>
|
|
49
|
+
<el-option :value="3" label="测试"></el-option>
|
|
50
|
+
<el-option :value="4" label="自定义"></el-option>
|
|
49
51
|
</el-select>
|
|
50
|
-
|
|
51
52
|
</template>
|
|
52
53
|
</el-table-column>
|
|
53
|
-
<el-table-column :label="i18nt('
|
|
54
|
-
<template slot-scope="
|
|
55
|
-
<el-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
54
|
+
<el-table-column :label="i18nt('自定义服务')" width="150">
|
|
55
|
+
<template slot-scope="{row}">
|
|
56
|
+
<el-input v-model="row.serveName" clearable :disabled="row.serveType!==4"></el-input>
|
|
57
|
+
</template>
|
|
58
|
+
</el-table-column>
|
|
59
|
+
<el-table-column :label="i18nt('组织')" width="250">
|
|
60
|
+
<template slot-scope="{row,$index}">
|
|
61
|
+
<el-input
|
|
62
|
+
class="search-input"
|
|
63
|
+
:value="getCompanyNames(row)"
|
|
64
|
+
clearable
|
|
65
|
+
@clear="
|
|
66
|
+
row.companyInfos = [];
|
|
67
|
+
"
|
|
68
|
+
v-el-readonly
|
|
69
|
+
>
|
|
70
|
+
<i slot="suffix" class="el-input__icon el-icon-search"
|
|
71
|
+
@click="openCompanyDialog(row, $index)"></i>
|
|
72
|
+
</el-input>
|
|
73
|
+
</template>
|
|
74
|
+
</el-table-column>
|
|
75
|
+
<el-table-column :label="i18nt('流程模板')" width="150">
|
|
76
|
+
<template slot-scope="{row}">
|
|
77
|
+
<el-input v-model="row.modelKey" clearable></el-input>
|
|
78
|
+
</template>
|
|
79
|
+
</el-table-column>
|
|
80
|
+
<el-table-column :label="i18nt('节点')" width="250">
|
|
81
|
+
<template slot-scope="{row}">
|
|
82
|
+
<el-input v-model="row.modelSteps" clearable></el-input>
|
|
60
83
|
</template>
|
|
61
84
|
</el-table-column>
|
|
85
|
+
|
|
86
|
+
<!-- <el-table-column :label="i18nt('流程模板')" width="250" prop="label">
|
|
87
|
+
<template slot-scope="scope">
|
|
88
|
+
<el-select v-model="scope.row.modelId" @change="changeModelId">
|
|
89
|
+
<el-option v-for="(wfDefItem,index) in wfDefItems" :key="index" :value="wfDefItem.modelId"
|
|
90
|
+
:label="wfDefItem.modelName"></el-option>
|
|
91
|
+
</el-select>
|
|
92
|
+
|
|
93
|
+
</template>
|
|
94
|
+
</el-table-column>
|
|
95
|
+
<el-table-column :label="i18nt('流程节点')" width="550" prop="prop">
|
|
96
|
+
<template slot-scope="scope">
|
|
97
|
+
<el-checkbox-group v-model="scope.row.nodeIds" v-if="!!wfNodeMap[scope.row.modelId]">
|
|
98
|
+
<el-checkbox v-for="(node,index) in wfNodeMap[scope.row.modelId]" :key="index"
|
|
99
|
+
:label="node.nodeId">{{ node.nodeName }}
|
|
100
|
+
</el-checkbox>
|
|
101
|
+
</el-checkbox-group>
|
|
102
|
+
</template>
|
|
103
|
+
</el-table-column>-->
|
|
62
104
|
<el-table-column :label="i18nt('designer.setting.actionColumn')" width="100" align="center">
|
|
63
105
|
<template #header>
|
|
64
106
|
<span>{{ i18nt('designer.setting.actionColumn') }}</span>
|
|
@@ -88,14 +130,19 @@
|
|
|
88
130
|
</el-button>
|
|
89
131
|
</div>
|
|
90
132
|
</el-dialog>
|
|
133
|
+
<companyInfoDialog v-if="showCompanyInfoDialog" :visiable.sync="showCompanyInfoDialog"
|
|
134
|
+
@confirm="confirmCompanyDialog" :multi="true" :allCompany="true" :rows="currentCompanyInfos"
|
|
135
|
+
fieldKey="companyCode"/>
|
|
91
136
|
</div>
|
|
92
137
|
</template>
|
|
93
138
|
|
|
94
139
|
<script>
|
|
95
140
|
import i18n from "../../../../../components/xform/utils/i18n"
|
|
141
|
+
import companyInfoDialog from "@base/views/user/company_info/dialog.vue";
|
|
96
142
|
|
|
97
143
|
export default {
|
|
98
144
|
name: "wfFlag-editor",
|
|
145
|
+
components: {companyInfoDialog},
|
|
99
146
|
mixins: [i18n],
|
|
100
147
|
props: {
|
|
101
148
|
designer: Object,
|
|
@@ -108,7 +155,12 @@ export default {
|
|
|
108
155
|
dialogVisible: false,
|
|
109
156
|
tableData: [],
|
|
110
157
|
wfDefItems: [],
|
|
111
|
-
wfNodeMap: {}
|
|
158
|
+
wfNodeMap: {},
|
|
159
|
+
|
|
160
|
+
currentCompanyInfos: [],
|
|
161
|
+
operateIndex: 0,
|
|
162
|
+
showCompanyInfoDialog: false
|
|
163
|
+
|
|
112
164
|
}
|
|
113
165
|
},
|
|
114
166
|
computed: {
|
|
@@ -160,10 +212,14 @@ export default {
|
|
|
160
212
|
});
|
|
161
213
|
},
|
|
162
214
|
addItem() {
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
215
|
+
let newItem = {
|
|
216
|
+
serveType: null,
|
|
217
|
+
serveName: null,
|
|
218
|
+
modelKey: null,
|
|
219
|
+
modelSteps: null,
|
|
220
|
+
companyInfos: []
|
|
221
|
+
}
|
|
222
|
+
this.tableData.push(newItem);
|
|
167
223
|
},
|
|
168
224
|
colSubmit() {
|
|
169
225
|
this.dialogVisible = !1;
|
|
@@ -189,6 +245,35 @@ export default {
|
|
|
189
245
|
if (val) {
|
|
190
246
|
this.optionModel.enabledByWf = false;
|
|
191
247
|
}
|
|
248
|
+
},
|
|
249
|
+
changeServeType(row) {
|
|
250
|
+
// modelKey
|
|
251
|
+
let map = {
|
|
252
|
+
1: "prod",
|
|
253
|
+
2: "at",
|
|
254
|
+
3: "dev"
|
|
255
|
+
}
|
|
256
|
+
let serveName = null;
|
|
257
|
+
let serveType = row.serveType;
|
|
258
|
+
if (serveType && map[serveType]) {
|
|
259
|
+
serveName = map[row.serveType];
|
|
260
|
+
}
|
|
261
|
+
row.serveName = serveName;
|
|
262
|
+
},
|
|
263
|
+
openCompanyDialog(row, rowIndex) {
|
|
264
|
+
this.operateIndex = rowIndex;
|
|
265
|
+
this.currentCompanyInfos = row.companyInfos || [];
|
|
266
|
+
this.showCompanyInfoDialog = true;
|
|
267
|
+
|
|
268
|
+
},
|
|
269
|
+
confirmCompanyDialog(rows) {
|
|
270
|
+
if (rows.length) {
|
|
271
|
+
let item = this.tableData[this.operateIndex];
|
|
272
|
+
item.companyInfos = rows;
|
|
273
|
+
}
|
|
274
|
+
},
|
|
275
|
+
getCompanyNames(item) {
|
|
276
|
+
return item.companyInfos.map(item => item.companyName).join(',');
|
|
192
277
|
}
|
|
193
278
|
}
|
|
194
279
|
}
|
|
@@ -85,6 +85,7 @@ export default {
|
|
|
85
85
|
props: ['title', 'visiable', 'multi', 'rows', 'param', 'firstEnabled', 'allCompany'],
|
|
86
86
|
mixins: [selectDialogMixins],
|
|
87
87
|
created() {
|
|
88
|
+
if (this.$attrs.fieldKey) this.fieldKey = this.$attrs.fieldKey;
|
|
88
89
|
this.initSetting();
|
|
89
90
|
},
|
|
90
91
|
mounted() {
|
|
@@ -96,7 +97,7 @@ export default {
|
|
|
96
97
|
falseValue: false,
|
|
97
98
|
selectMulti: true,
|
|
98
99
|
formData: {},
|
|
99
|
-
vxeOption: {}
|
|
100
|
+
vxeOption: {},
|
|
100
101
|
};
|
|
101
102
|
},
|
|
102
103
|
methods: {
|
|
@@ -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,15 +38,25 @@
|
|
|
38
38
|
<em class="f-red">*</em>
|
|
39
39
|
{{ $t1('登录名') }}
|
|
40
40
|
</th>
|
|
41
|
-
<td>
|
|
41
|
+
<td colspan="3">
|
|
42
42
|
{{ user.loginAccount }}
|
|
43
43
|
</td>
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
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/>
|
|
54
|
+
</el-form-item>
|
|
47
55
|
</td>
|
|
56
|
+
</tr>
|
|
57
|
+
<tr>
|
|
48
58
|
<th>{{ $t1('密码') }}</th>
|
|
49
|
-
<td>
|
|
59
|
+
<td colspan="3">
|
|
50
60
|
<el-form-item prop="password" :rules="passRules">
|
|
51
61
|
<el-input
|
|
52
62
|
size="small"
|
|
@@ -60,8 +70,10 @@
|
|
|
60
70
|
/>
|
|
61
71
|
</el-form-item>
|
|
62
72
|
</td>
|
|
73
|
+
</tr>
|
|
74
|
+
<tr>
|
|
63
75
|
<th>{{ $t1('确认密码') }}</th>
|
|
64
|
-
<td>
|
|
76
|
+
<td colspan="3">
|
|
65
77
|
<el-form-item prop="rePassword" :rules="pass2Rules">
|
|
66
78
|
<el-input
|
|
67
79
|
size="small"
|
|
@@ -77,59 +89,6 @@
|
|
|
77
89
|
</el-form-item>
|
|
78
90
|
</td>
|
|
79
91
|
</tr>
|
|
80
|
-
<tr>
|
|
81
|
-
<th>
|
|
82
|
-
<em class="f-red">*</em>
|
|
83
|
-
{{ $t1('姓名') }}
|
|
84
|
-
</th>
|
|
85
|
-
<td>
|
|
86
|
-
<el-form-item prop="nickName" :rules="[{ required: true, trigger: 'blur' }]">
|
|
87
|
-
<el-input size="small" v-model="user.nickName" maxlength="200" lay-verify="required" required=""
|
|
88
|
-
clearable/>
|
|
89
|
-
</el-form-item>
|
|
90
|
-
</td>
|
|
91
|
-
<th>{{ $t1('性别') }}</th>
|
|
92
|
-
<td>
|
|
93
|
-
<template v-if="user.gender==1">{{ $t1('男') }}</template>
|
|
94
|
-
<template v-if="user.gender==2">{{ $t1('女') }}</template>
|
|
95
|
-
</td>
|
|
96
|
-
<th>{{ $t1('出生日期') }}</th>
|
|
97
|
-
<td>
|
|
98
|
-
{{ user.birth }}
|
|
99
|
-
</td>
|
|
100
|
-
<th>{{ $t1('邮编') }}</th>
|
|
101
|
-
<td>
|
|
102
|
-
{{user.zipCode}}
|
|
103
|
-
</td>
|
|
104
|
-
</tr>
|
|
105
|
-
<tr>
|
|
106
|
-
<th>{{ $t1('地址') }}</th>
|
|
107
|
-
<td colspan="3">
|
|
108
|
-
{{user.address}}
|
|
109
|
-
</td>
|
|
110
|
-
<th>{{ $t1('设置') }}</th>
|
|
111
|
-
<td colspan="3">
|
|
112
|
-
<div class="txt-status" v-if="user.enabled">{{ $t1('启用') }}</div>
|
|
113
|
-
<div class="txt-status s-3" v-else>{｛$t1('禁用')｝}</div>
|
|
114
|
-
</td>
|
|
115
|
-
</tr>
|
|
116
|
-
<tr>
|
|
117
|
-
<th>{{ $t1('头像') }}</th>
|
|
118
|
-
<td colspan="7">
|
|
119
|
-
<baseUpload :limit="1" accept="image/png, image/jpeg" multi="false" :file.sync="user.headPhotoUrl"
|
|
120
|
-
dataType="medium" :edit="false"></baseUpload>
|
|
121
|
-
</td>
|
|
122
|
-
</tr>
|
|
123
|
-
<tr>
|
|
124
|
-
<th>{{ $t1('创建人') }}</th>
|
|
125
|
-
<td>{{ user.createBy }}</td>
|
|
126
|
-
<th>{{ $t1('创建时间') }}</th>
|
|
127
|
-
<td>{{ user.createDate }}</td>
|
|
128
|
-
<th>{{ $t1('更新人') }}</th>
|
|
129
|
-
<td>{{ user.modifyBy }}</td>
|
|
130
|
-
<th>{{ $t1('更新时间') }}</th>
|
|
131
|
-
<td>{{ user.modifyDate }}</td>
|
|
132
|
-
</tr>
|
|
133
92
|
</tbody>
|
|
134
93
|
</table>
|
|
135
94
|
</div>
|
|
@@ -10,8 +10,7 @@
|
|
|
10
10
|
<el-button type="primary" plain class="button-sty" @click="reloadContent" icon="el-icon-refresh-right">
|
|
11
11
|
{{ $t1('重置') }}
|
|
12
12
|
</el-button>
|
|
13
|
-
<el-button type="primary" class="button-sty" icon="el-icon-check" @click="saveData">{{
|
|
14
|
-
</el-button>
|
|
13
|
+
<el-button type="primary" class="button-sty" icon="el-icon-check" @click="saveData">{{$t1('保存')}}</el-button>
|
|
15
14
|
</div>
|
|
16
15
|
</div>
|
|
17
16
|
<div class="d-cont">
|
|
@@ -25,11 +24,23 @@
|
|
|
25
24
|
{{ $t1('登录名') }}
|
|
26
25
|
</th>
|
|
27
26
|
<td>
|
|
28
|
-
|
|
27
|
+
<el-form-item prop="loginAccount" :rules="[{ required: true, trigger: 'blur' }]">
|
|
28
|
+
<template v-if="dataId">
|
|
29
|
+
<el-input size="small" v-model="user.loginAccount" maxlength="255" autocomplete="off"
|
|
30
|
+
lay-verify="required" required="" :readonly="true"/>
|
|
31
|
+
</template>
|
|
32
|
+
<template v-else>
|
|
33
|
+
<el-input size="small" v-model="user.loginAccount" maxlength="255" autocomplete="off"
|
|
34
|
+
lay-verify="required" required="" clearable/>
|
|
35
|
+
</template>
|
|
36
|
+
</el-form-item>
|
|
29
37
|
</td>
|
|
30
38
|
<th>{{ $t1('手机') }}</th>
|
|
31
39
|
<td>
|
|
32
|
-
|
|
40
|
+
<el-form-item prop="mobile" :rules="[{ required: false, trigger: 'blur' }]">
|
|
41
|
+
<el-input size="small" v-model="user.mobile" type="text" maxlength="255" autocomplete="off"
|
|
42
|
+
lay-verify="required|phone" clearable/>
|
|
43
|
+
</el-form-item>
|
|
33
44
|
</td>
|
|
34
45
|
<th>{{ $t1('密码') }}</th>
|
|
35
46
|
<td>
|
|
@@ -68,34 +79,36 @@
|
|
|
68
79
|
</td>
|
|
69
80
|
<th>{{ $t1('性别') }}</th>
|
|
70
81
|
<td>
|
|
71
|
-
<
|
|
72
|
-
|
|
82
|
+
<el-radio-group v-model="user.gender">
|
|
83
|
+
<el-radio :label="1">{{ $t1('男') }}</el-radio>
|
|
84
|
+
<el-radio :label="2">{{ $t1('女') }}</el-radio>
|
|
85
|
+
</el-radio-group>
|
|
73
86
|
</td>
|
|
74
87
|
<th>{{ $t1('出生日期') }}</th>
|
|
75
88
|
<td>
|
|
76
|
-
|
|
89
|
+
<el-date-picker size="small" v-model="user.birth" type="date" placeholder="选择日期"
|
|
90
|
+
value-format="yyyy-MM-dd" clearable/>
|
|
77
91
|
</td>
|
|
78
92
|
<th>{{ $t1('邮编') }}</th>
|
|
79
93
|
<td>
|
|
80
|
-
|
|
94
|
+
<el-input size="small" id="zipCode" v-model="user.zipCode" name="zipCode" maxlength="255" clearable/>
|
|
81
95
|
</td>
|
|
82
96
|
</tr>
|
|
83
97
|
<tr>
|
|
84
98
|
<th>{{ $t1('地址') }}</th>
|
|
85
99
|
<td colspan="3">
|
|
86
|
-
|
|
100
|
+
<el-input size="small" v-model="user.address" class="b" maxlength="255" clearable/>
|
|
87
101
|
</td>
|
|
88
102
|
<th>{{ $t1('设置') }}</th>
|
|
89
103
|
<td colspan="3">
|
|
90
|
-
<
|
|
91
|
-
<div class="txt-status s-3" v-else>{｛$t1('禁用')｝}</div>
|
|
104
|
+
<el-checkbox :label="$t1('是否启用')" v-model="user.enabled"></el-checkbox>
|
|
92
105
|
</td>
|
|
93
106
|
</tr>
|
|
94
107
|
<tr>
|
|
95
108
|
<th>{{ $t1('头像') }}</th>
|
|
96
109
|
<td colspan="7">
|
|
97
110
|
<baseUpload :limit="1" accept="image/png, image/jpeg" multi="false" :file.sync="user.headPhotoUrl"
|
|
98
|
-
dataType="medium"
|
|
111
|
+
dataType="medium"></baseUpload>
|
|
99
112
|
</td>
|
|
100
113
|
</tr>
|
|
101
114
|
<tr>
|