kz-ui-base 1.0.161 → 2.0.148
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/api/system/config.js +0 -17
- package/common/src/components/base/dialog/BaseDialog.vue +4 -15
- package/common/src/components/base/dialog/editDialog.vue +2 -2
- package/common/src/components/basics/RightToolbar/advancedQuery.vue +26 -5
- package/common/src/components/basics/RightToolbar/advancedQueryClose.vue +26 -5
- package/common/src/components/basics/RightToolbar/index.vue +5 -6
- package/common/src/components/custom/Material/index.vue +27 -25
- package/common/src/components/custom/Material/indexTs.vue +27 -25
- package/common/src/utils/request.js +0 -5
- package/common/src/views/login.vue +0 -5
- package/common/src/views/tenantLogin.vue +0 -5
- package/components/base/dialog/elTable.vue +2 -2
- package/components/base/dialog/sampleEditDialog.vue +38 -61
- package/components/base/dialog/smapleDialog.vue +12 -12
- package/components/base/dialog/tableForm.vue +6 -6
- package/components/customForm/OpMenus.vue +5 -5
- package/components/customForm/datePicker.vue +5 -4
- package/components/customForm/dropDownList.vue +8 -8
- package/components/customForm/lookupDialog.vue +3 -3
- package/components/customForm/printDialog.vue +17 -17
- package/components/customForm/sampleEditDialog.vue +3 -3
- package/components/customForm/searchTable.vue +4 -4
- package/components/customForm/table.vue +5 -5
- package/components/customForm/textarea.vue +1 -1
- package/components/customForm/treeDownList.vue +1 -1
- package/components/customForm/upload.vue +1 -1
- package/components/customForm/uploadButton.vue +7 -7
- package/components/customForm/uploadDialog.vue +1 -1
- package/list-base-page/doublelistBasePageTs.vue +16 -16
- package/list-base-page/listBasePageTs.vue +64 -228
- package/package.json +1 -1
- package/views/bd/common/modal/AddressInfoModal.vue +8 -8
- package/views/bd/common/modal/BankInfoModal.vue +10 -10
- package/views/bd/common/modal/CustomerContactsModal.vue +13 -13
- package/views/bd/common/modal/CustomerModal.vue +49 -51
- package/views/bd/common/modal/DeptModal.vue +10 -10
- package/views/bd/common/modal/EmployeeModal.vue +22 -26
- package/views/bd/common/modal/ItemModal.vue +20 -23
- package/views/bd/common/modal/ItemModalBk.vue +8 -8
- package/views/bd/common/modal/NumberingRuleModal.vue +8 -8
- package/views/bd/common/modal/PostModal.vue +22 -22
- package/views/bd/common/modal/ProjectModal.vue +8 -8
- package/views/bd/common/modal/SalesmanInfoModel.vue +7 -7
- package/views/bd/common/modal/VendorModal.vue +24 -28
- package/views/bd/common/modal/WorkGroupModal.vue +40 -44
- package/views/bd/common/modal/materialCodeModal.vue +30 -23
- package/views/fd/common/modal/AddResourceModal.vue +6 -8
- package/views/fd/common/modal/AssetModal.vue +17 -17
- package/views/fd/common/modal/EquipmentModal.vue +10 -10
- package/views/fd/common/modal/FactoryTreeModal.vue +1 -3
- package/views/fd/common/modal/ResourceModal.vue +6 -6
- package/views/fd/common/modal/SiteModal.vue +11 -9
- package/views/fd/common/modal/StorageUnitModal.vue +9 -9
- package/views/fd/common/modal/StorageZoneModal.vue +11 -11
- package/views/fd/common/modal/WorkAreaModal.vue +9 -9
- package/views/fd/common/modal/WorkCenterModal.vue +9 -9
- package/views/fd/common/modal/WorkUnitModal.vue +9 -9
- package/views/pd/common/modal/BopModal.vue +10 -10
- package/views/pd/common/modal/DrawingPathModal.vue +52 -52
- package/views/pd/common/modal/ParameterModal.vue +18 -18
- package/views/pd/common/modal/ProcessModal.vue +15 -15
- package/views/pd/common/modal/ProdRoutingDtlModal.vue +19 -19
- package/views/pd/common/modal/ProdRoutingModal.vue +14 -14
- package/views/pd/common/modal/ProdStructureModal.vue +14 -14
- package/views/pd/common/modal/ProdstructTemplateHdrModal.vue +25 -27
- package/views/pd/common/modal/ProductionVersionModal.vue +35 -35
- package/views/pd/common/modal/technicalStandardModal.vue +20 -20
- package/views/system/common/modal/UserModal.vue +70 -72
- package/components/base/dialog/MultiLanguageDialog.vue +0 -308
- package/components/base/dialog/config.js +0 -85
|
@@ -174,12 +174,7 @@ export default {
|
|
|
174
174
|
created() {
|
|
175
175
|
this.$store.dispatch("LogOut").then(() => {
|
|
176
176
|
this.$store.dispatch("tagsView/delAllViews");
|
|
177
|
-
// 清空localStorage但保留语言设置
|
|
178
|
-
const locale = localStorage.getItem("locale");
|
|
179
177
|
localStorage.clear();
|
|
180
|
-
if (locale) {
|
|
181
|
-
localStorage.setItem("locale", locale);
|
|
182
|
-
}
|
|
183
178
|
localforage.clear();
|
|
184
179
|
removeToken();
|
|
185
180
|
this.axios.get("/config.json").then((res) => {
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
:data="listData"
|
|
7
7
|
:listCustomOpMenus="listCustomOpMenus"
|
|
8
8
|
>
|
|
9
|
-
<el-table-column type="index"
|
|
9
|
+
<el-table-column type="index" label="序号" width="50" align="center">
|
|
10
10
|
<template scope="scope">
|
|
11
11
|
<span>{{
|
|
12
12
|
(listQueryParams.pageNum - 1) * listQueryParams.pageSize +
|
|
@@ -121,7 +121,7 @@
|
|
|
121
121
|
|
|
122
122
|
<el-table-column
|
|
123
123
|
v-if="listSetting && listSetting.isShowOpColumn"
|
|
124
|
-
|
|
124
|
+
label="操作"
|
|
125
125
|
align="center"
|
|
126
126
|
min-width="160"
|
|
127
127
|
class-name="small-padding fixed-width"
|
|
@@ -41,18 +41,18 @@
|
|
|
41
41
|
type="primary"
|
|
42
42
|
:loading="setting.submitLoading"
|
|
43
43
|
@click="submitForm"
|
|
44
|
-
|
|
44
|
+
>确 定</el-button
|
|
45
45
|
>
|
|
46
|
-
<el-button @click="cancel"
|
|
46
|
+
<el-button @click="cancel">取 消</el-button>
|
|
47
47
|
</div> -->
|
|
48
48
|
<div slot="footer" class="dialog-footer">
|
|
49
49
|
<el-button
|
|
50
50
|
type="primary"
|
|
51
51
|
:loading="setting.submitLoading"
|
|
52
52
|
@click="submitForm"
|
|
53
|
-
|
|
53
|
+
>确 定</el-button
|
|
54
54
|
>
|
|
55
|
-
<el-button @click="cancel"
|
|
55
|
+
<el-button @click="cancel">取 消</el-button>
|
|
56
56
|
</div>
|
|
57
57
|
</div>
|
|
58
58
|
</template>
|
|
@@ -96,7 +96,7 @@ export default {
|
|
|
96
96
|
name: "basic",
|
|
97
97
|
visable: true,
|
|
98
98
|
icon: "ion-plus-round",
|
|
99
|
-
text: "",
|
|
99
|
+
text: "基本信息",
|
|
100
100
|
type: "area",
|
|
101
101
|
},
|
|
102
102
|
{
|
|
@@ -117,20 +117,20 @@ export default {
|
|
|
117
117
|
// 列信息
|
|
118
118
|
columns: [
|
|
119
119
|
{
|
|
120
|
-
text:
|
|
120
|
+
text: `公告标题`,
|
|
121
121
|
property: "noticeTitle",
|
|
122
122
|
displayType: "TextBox",
|
|
123
123
|
visible: true,
|
|
124
|
-
placeholder: "", //占位符文案 默认不传 不传就显示text的文案
|
|
124
|
+
placeholder: "自定义占位符", //占位符文案 默认不传 不传就显示text的文案
|
|
125
125
|
setting: {
|
|
126
|
-
default: "",
|
|
126
|
+
default: "默认标题",
|
|
127
127
|
},
|
|
128
128
|
// inputType: "number", // 输入类型默认不传
|
|
129
129
|
// maxLength: "10", // 输入长度限制
|
|
130
130
|
area: "basic",
|
|
131
131
|
},
|
|
132
132
|
{
|
|
133
|
-
text:
|
|
133
|
+
text: `公告类型`,
|
|
134
134
|
property: "noticeType",
|
|
135
135
|
displayType: "DropDownList",
|
|
136
136
|
setting: {
|
|
@@ -142,7 +142,7 @@ export default {
|
|
|
142
142
|
area: "basic",
|
|
143
143
|
},
|
|
144
144
|
{
|
|
145
|
-
text:
|
|
145
|
+
text: `公告类型`,
|
|
146
146
|
property: "noticeType",
|
|
147
147
|
displayType: "DropDownList",
|
|
148
148
|
setting: {
|
|
@@ -154,7 +154,7 @@ export default {
|
|
|
154
154
|
area: "basic",
|
|
155
155
|
},
|
|
156
156
|
{
|
|
157
|
-
text:
|
|
157
|
+
text: `公告类型`,
|
|
158
158
|
property: "noticeType",
|
|
159
159
|
displayType: "DropDownList",
|
|
160
160
|
setting: {
|
|
@@ -166,7 +166,7 @@ export default {
|
|
|
166
166
|
area: "basic",
|
|
167
167
|
},
|
|
168
168
|
{
|
|
169
|
-
text:
|
|
169
|
+
text: `公告类型`,
|
|
170
170
|
property: "noticeType",
|
|
171
171
|
displayType: "DropDownList",
|
|
172
172
|
setting: {
|
|
@@ -178,7 +178,7 @@ export default {
|
|
|
178
178
|
area: "basic",
|
|
179
179
|
},
|
|
180
180
|
{
|
|
181
|
-
text:
|
|
181
|
+
text: `公告类型`,
|
|
182
182
|
property: "noticeType",
|
|
183
183
|
displayType: "DropDownList",
|
|
184
184
|
setting: {
|
|
@@ -190,7 +190,7 @@ export default {
|
|
|
190
190
|
area: "basic",
|
|
191
191
|
},
|
|
192
192
|
{
|
|
193
|
-
text:
|
|
193
|
+
text: `公告类型`,
|
|
194
194
|
property: "noticeType",
|
|
195
195
|
displayType: "DropDownList",
|
|
196
196
|
setting: {
|
|
@@ -202,7 +202,7 @@ export default {
|
|
|
202
202
|
area: "basic",
|
|
203
203
|
},
|
|
204
204
|
{
|
|
205
|
-
text:
|
|
205
|
+
text: `公告类型`,
|
|
206
206
|
property: "noticeType",
|
|
207
207
|
displayType: "DropDownList",
|
|
208
208
|
setting: {
|
|
@@ -214,7 +214,7 @@ export default {
|
|
|
214
214
|
area: "basic",
|
|
215
215
|
},
|
|
216
216
|
{
|
|
217
|
-
text:
|
|
217
|
+
text: `公告类型`,
|
|
218
218
|
property: "noticeType",
|
|
219
219
|
displayType: "DropDownList",
|
|
220
220
|
setting: {
|
|
@@ -226,7 +226,7 @@ export default {
|
|
|
226
226
|
area: "basic",
|
|
227
227
|
},
|
|
228
228
|
{
|
|
229
|
-
text:
|
|
229
|
+
text: `公告类型`,
|
|
230
230
|
property: "noticeType",
|
|
231
231
|
displayType: "DropDownList",
|
|
232
232
|
setting: {
|
|
@@ -238,7 +238,7 @@ export default {
|
|
|
238
238
|
area: "basic",
|
|
239
239
|
},
|
|
240
240
|
{
|
|
241
|
-
text:
|
|
241
|
+
text: `公告类型`,
|
|
242
242
|
property: "noticeType",
|
|
243
243
|
displayType: "DropDownList",
|
|
244
244
|
setting: {
|
|
@@ -250,7 +250,7 @@ export default {
|
|
|
250
250
|
area: "basic",
|
|
251
251
|
},
|
|
252
252
|
{
|
|
253
|
-
text:
|
|
253
|
+
text: `公告类型`,
|
|
254
254
|
property: "noticeType",
|
|
255
255
|
displayType: "DropDownList",
|
|
256
256
|
setting: {
|
|
@@ -262,7 +262,7 @@ export default {
|
|
|
262
262
|
area: "basic",
|
|
263
263
|
},
|
|
264
264
|
{
|
|
265
|
-
text:
|
|
265
|
+
text: `公告类型`,
|
|
266
266
|
property: "noticeType",
|
|
267
267
|
displayType: "DropDownList",
|
|
268
268
|
setting: {
|
|
@@ -274,7 +274,7 @@ export default {
|
|
|
274
274
|
area: "basic",
|
|
275
275
|
},
|
|
276
276
|
{
|
|
277
|
-
text:
|
|
277
|
+
text: `公告类型`,
|
|
278
278
|
property: "noticeType",
|
|
279
279
|
displayType: "DropDownList",
|
|
280
280
|
setting: {
|
|
@@ -286,7 +286,7 @@ export default {
|
|
|
286
286
|
area: "basic",
|
|
287
287
|
},
|
|
288
288
|
{
|
|
289
|
-
text:
|
|
289
|
+
text: `公告类型`,
|
|
290
290
|
property: "noticeType",
|
|
291
291
|
displayType: "DropDownList",
|
|
292
292
|
setting: {
|
|
@@ -298,7 +298,7 @@ export default {
|
|
|
298
298
|
area: "basic",
|
|
299
299
|
},
|
|
300
300
|
{
|
|
301
|
-
text:
|
|
301
|
+
text: `公告类型`,
|
|
302
302
|
property: "noticeType",
|
|
303
303
|
displayType: "DropDownList",
|
|
304
304
|
setting: {
|
|
@@ -310,7 +310,7 @@ export default {
|
|
|
310
310
|
area: "basic",
|
|
311
311
|
},
|
|
312
312
|
{
|
|
313
|
-
text:
|
|
313
|
+
text: `公告类型`,
|
|
314
314
|
property: "noticeType",
|
|
315
315
|
displayType: "DropDownList",
|
|
316
316
|
setting: {
|
|
@@ -322,7 +322,7 @@ export default {
|
|
|
322
322
|
area: "basic",
|
|
323
323
|
},
|
|
324
324
|
{
|
|
325
|
-
text:
|
|
325
|
+
text: `公告类型`,
|
|
326
326
|
property: "noticeType",
|
|
327
327
|
displayType: "DropDownList",
|
|
328
328
|
setting: {
|
|
@@ -334,7 +334,7 @@ export default {
|
|
|
334
334
|
area: "basic",
|
|
335
335
|
},
|
|
336
336
|
{
|
|
337
|
-
text:
|
|
337
|
+
text: `公告类型`,
|
|
338
338
|
property: "noticeType",
|
|
339
339
|
displayType: "DropDownList",
|
|
340
340
|
setting: {
|
|
@@ -349,16 +349,16 @@ export default {
|
|
|
349
349
|
// 表单校验
|
|
350
350
|
rules: {
|
|
351
351
|
noticeTitle: [
|
|
352
|
-
{ required: true, message: "", trigger: "blur" },
|
|
352
|
+
{ required: true, message: "公告标题不能为空", trigger: "blur" },
|
|
353
353
|
{
|
|
354
354
|
min: 2,
|
|
355
355
|
max: 20,
|
|
356
|
-
message: "",
|
|
356
|
+
message: "公告标题长度必须介于 2 和 20 之间",
|
|
357
357
|
trigger: "blur",
|
|
358
358
|
},
|
|
359
359
|
],
|
|
360
360
|
noticeType: [
|
|
361
|
-
{ required: true, message: "", trigger: "blur" },
|
|
361
|
+
{ required: true, message: "公告类型不能为空", trigger: "blur" },
|
|
362
362
|
],
|
|
363
363
|
},
|
|
364
364
|
//可编辑表格配置
|
|
@@ -396,13 +396,13 @@ export default {
|
|
|
396
396
|
},
|
|
397
397
|
{
|
|
398
398
|
prop: "noticeTitle",
|
|
399
|
-
text: "",
|
|
399
|
+
text: "公告标题",
|
|
400
400
|
attr: { width: "180" },
|
|
401
401
|
edit: true,
|
|
402
402
|
},
|
|
403
403
|
{
|
|
404
404
|
prop: "noticeType",
|
|
405
|
-
text: "",
|
|
405
|
+
text: "公告类型",
|
|
406
406
|
attr: { minWidth: "110" },
|
|
407
407
|
edit: true,
|
|
408
408
|
type: "select",
|
|
@@ -413,19 +413,19 @@ export default {
|
|
|
413
413
|
},
|
|
414
414
|
{
|
|
415
415
|
prop: "remark",
|
|
416
|
-
text: "",
|
|
416
|
+
text: "备注",
|
|
417
417
|
attr: { minWidth: "110" },
|
|
418
418
|
edit: true,
|
|
419
419
|
},
|
|
420
420
|
{
|
|
421
421
|
prop: "noticeContent",
|
|
422
|
-
text: "",
|
|
422
|
+
text: "自定义html",
|
|
423
423
|
attr: { minWidth: "110" },
|
|
424
424
|
edit: true,
|
|
425
425
|
},
|
|
426
426
|
{
|
|
427
427
|
prop: "product",
|
|
428
|
-
text: "",
|
|
428
|
+
text: "产品",
|
|
429
429
|
attr: { minWidth: "110" },
|
|
430
430
|
edit: true,
|
|
431
431
|
type: "checkbox",
|
|
@@ -436,7 +436,7 @@ export default {
|
|
|
436
436
|
},
|
|
437
437
|
{
|
|
438
438
|
prop: "date",
|
|
439
|
-
text: "",
|
|
439
|
+
text: "日期",
|
|
440
440
|
attr: { minWidth: "110" },
|
|
441
441
|
edit: true,
|
|
442
442
|
type: "date",
|
|
@@ -444,14 +444,14 @@ export default {
|
|
|
444
444
|
},
|
|
445
445
|
{
|
|
446
446
|
prop: "status",
|
|
447
|
-
text: "",
|
|
447
|
+
text: "锁定",
|
|
448
448
|
attr: { minWidth: "110" },
|
|
449
449
|
edit: true,
|
|
450
450
|
type: "switch",
|
|
451
451
|
},
|
|
452
452
|
{
|
|
453
453
|
prop: "search",
|
|
454
|
-
text: "",
|
|
454
|
+
text: "搜索",
|
|
455
455
|
attr: { minWidth: "110" },
|
|
456
456
|
edit: true,
|
|
457
457
|
type: "mixInput",
|
|
@@ -459,7 +459,7 @@ export default {
|
|
|
459
459
|
console.log(row);
|
|
460
460
|
},
|
|
461
461
|
},
|
|
462
|
-
{ prop: "opt", text: "", attr: { minWidth: "110" }, edit: true },
|
|
462
|
+
{ prop: "opt", text: "操作", attr: { minWidth: "110" }, edit: true },
|
|
463
463
|
],
|
|
464
464
|
data: [],
|
|
465
465
|
},
|
|
@@ -468,7 +468,6 @@ export default {
|
|
|
468
468
|
watch: {},
|
|
469
469
|
created() {
|
|
470
470
|
console.log(this.entity);
|
|
471
|
-
this.initI18n();
|
|
472
471
|
//有可编辑表格的情况下
|
|
473
472
|
if (this.tableSetting.visible) {
|
|
474
473
|
/** 查询列表 */
|
|
@@ -488,28 +487,6 @@ export default {
|
|
|
488
487
|
mounted() {},
|
|
489
488
|
activated() {},
|
|
490
489
|
methods: {
|
|
491
|
-
initI18n() {
|
|
492
|
-
this.areaSetting[0].text = this.t('common.basicInfo');
|
|
493
|
-
this.columns[0].text = this.t('common.announcementTitle');
|
|
494
|
-
this.columns[0].placeholder = this.t('common.customPlaceholder');
|
|
495
|
-
this.columns[0].setting.default = this.t('common.defaultTitle');
|
|
496
|
-
this.columns[1].text = this.t('common.announcementType');
|
|
497
|
-
for (let i = 2; i < this.columns.length; i++) {
|
|
498
|
-
this.columns[i].text = this.t('common.announcementTitle');
|
|
499
|
-
}
|
|
500
|
-
this.rules.noticeTitle[0].message = this.t('common.announcementTitleRequired');
|
|
501
|
-
this.rules.noticeTitle[1].message = this.t('common.announcementTitleLength');
|
|
502
|
-
this.rules.noticeType[0].message = this.t('common.announcementTypeRequired');
|
|
503
|
-
this.tableSetting.columns[1].text = this.t('common.announcementTitle');
|
|
504
|
-
this.tableSetting.columns[2].text = this.t('common.announcementType');
|
|
505
|
-
this.tableSetting.columns[3].text = this.t('common.remark');
|
|
506
|
-
this.tableSetting.columns[4].text = this.t('common.customHtml');
|
|
507
|
-
this.tableSetting.columns[5].text = this.t('common.product');
|
|
508
|
-
this.tableSetting.columns[6].text = this.t('common.date');
|
|
509
|
-
this.tableSetting.columns[7].text = this.t('common.locked');
|
|
510
|
-
this.tableSetting.columns[8].text = this.t('common.search');
|
|
511
|
-
this.tableSetting.columns[9].text = this.t('common.operation');
|
|
512
|
-
},
|
|
513
490
|
//当前绑定实体字段值变更事件
|
|
514
491
|
onChangeEvent(args) {
|
|
515
492
|
console.log(args);
|
|
@@ -91,35 +91,35 @@ export default class MaterialsEditDialog extends Vue {
|
|
|
91
91
|
name: "basic",
|
|
92
92
|
visable: true,
|
|
93
93
|
icon: "ion-plus-round",
|
|
94
|
-
text:
|
|
94
|
+
text: "基本信息",
|
|
95
95
|
type: "area",
|
|
96
96
|
},
|
|
97
97
|
{
|
|
98
98
|
name: "tab1",
|
|
99
99
|
visable: true,
|
|
100
100
|
icon: "ion-plus-round",
|
|
101
|
-
text:
|
|
101
|
+
text: "叫料数据",
|
|
102
102
|
type: "tab",
|
|
103
103
|
},
|
|
104
104
|
];
|
|
105
105
|
// 列信息
|
|
106
106
|
columns = [
|
|
107
107
|
{
|
|
108
|
-
text:
|
|
108
|
+
text: `日期`,
|
|
109
109
|
property: "noticeTitle",
|
|
110
110
|
displayType: "TextBox",
|
|
111
111
|
visible: true,
|
|
112
112
|
area: "basic",
|
|
113
113
|
},
|
|
114
114
|
{
|
|
115
|
-
text:
|
|
115
|
+
text: `班次`,
|
|
116
116
|
property: "noticeTitle",
|
|
117
117
|
displayType: "TextBox",
|
|
118
118
|
visible: true,
|
|
119
119
|
area: "basic",
|
|
120
120
|
},
|
|
121
121
|
{
|
|
122
|
-
text:
|
|
122
|
+
text: `计划编号`,
|
|
123
123
|
property: "noticeTitle",
|
|
124
124
|
displayType: "TextBox",
|
|
125
125
|
visible: true,
|
|
@@ -127,7 +127,7 @@ export default class MaterialsEditDialog extends Vue {
|
|
|
127
127
|
width: 24,
|
|
128
128
|
},
|
|
129
129
|
{
|
|
130
|
-
text:
|
|
130
|
+
text: `信息提示`,
|
|
131
131
|
property: "noticeTitle",
|
|
132
132
|
displayType: "TextBox",
|
|
133
133
|
visible: true,
|
|
@@ -138,16 +138,16 @@ export default class MaterialsEditDialog extends Vue {
|
|
|
138
138
|
// 表单校验
|
|
139
139
|
rules = {
|
|
140
140
|
noticeTitle: [
|
|
141
|
-
{ required: true, message:
|
|
141
|
+
{ required: true, message: "公告标题不能为空", trigger: "blur" },
|
|
142
142
|
{
|
|
143
143
|
min: 2,
|
|
144
144
|
max: 20,
|
|
145
|
-
message:
|
|
145
|
+
message: "公告标题长度必须介于 2 和 20 之间",
|
|
146
146
|
trigger: "blur",
|
|
147
147
|
},
|
|
148
148
|
],
|
|
149
149
|
noticeType: [
|
|
150
|
-
{ required: true, message:
|
|
150
|
+
{ required: true, message: "公告类型不能为空", trigger: "blur" },
|
|
151
151
|
],
|
|
152
152
|
};
|
|
153
153
|
loading = false;
|
|
@@ -155,10 +155,10 @@ export default class MaterialsEditDialog extends Vue {
|
|
|
155
155
|
isMultiple = true;
|
|
156
156
|
// 列表列信息
|
|
157
157
|
listColumns = [
|
|
158
|
-
{ text:
|
|
159
|
-
{ text:
|
|
158
|
+
{ text: `用户名1`, property: "userName", displayType: "TextBox" },
|
|
159
|
+
{ text: `昵称`, property: "nickName", displayType: "TextBox" },
|
|
160
160
|
{
|
|
161
|
-
text:
|
|
161
|
+
text: `用户`,
|
|
162
162
|
property: "test7",
|
|
163
163
|
displayType: "dropDownList",
|
|
164
164
|
setting: { type: "User", displayMode: "form" },
|
|
@@ -30,7 +30,7 @@
|
|
|
30
30
|
v-if="column.displayType == 'TextBox'"
|
|
31
31
|
size="small"
|
|
32
32
|
v-model="scope.row[column.property]"
|
|
33
|
-
|
|
33
|
+
placeholder="请输入内容"
|
|
34
34
|
></el-input>
|
|
35
35
|
|
|
36
36
|
<dropDownList
|
|
@@ -81,7 +81,7 @@
|
|
|
81
81
|
</template>
|
|
82
82
|
|
|
83
83
|
<el-table-column
|
|
84
|
-
|
|
84
|
+
label="操作"
|
|
85
85
|
align="center"
|
|
86
86
|
min-width="160"
|
|
87
87
|
class-name="small-padding fixed-width"
|
|
@@ -92,16 +92,16 @@
|
|
|
92
92
|
size="mini"
|
|
93
93
|
type="text"
|
|
94
94
|
@click="deleteSingle(scope.$index)"
|
|
95
|
-
|
|
95
|
+
>删除</el-button
|
|
96
96
|
>
|
|
97
97
|
</template>
|
|
98
98
|
</el-table-column>
|
|
99
99
|
</el-table>
|
|
100
100
|
</el-form>
|
|
101
101
|
<div style="margin-top: 8px" v-if="listSetting.buttonShow">
|
|
102
|
-
<el-button type="primary" size="mini" @click="newAdd"
|
|
102
|
+
<el-button type="primary" size="mini" @click="newAdd">新增数据</el-button>
|
|
103
103
|
<el-button @click="deleteAll" type="danger" size="mini"
|
|
104
|
-
|
|
104
|
+
>删除选中</el-button
|
|
105
105
|
>
|
|
106
106
|
</div>
|
|
107
107
|
</div>
|
|
@@ -166,7 +166,7 @@ export default class TableForm extends Vue {
|
|
|
166
166
|
}
|
|
167
167
|
deleteAll() {
|
|
168
168
|
if (this.multipleSelectAry.length == 0) {
|
|
169
|
-
(this as any).$message.error(
|
|
169
|
+
(this as any).$message.error("请选择要删除的数据");
|
|
170
170
|
}
|
|
171
171
|
this.model.listData = this.model.listData.filter((item, index) => {
|
|
172
172
|
return !this.multipleSelectAry.includes(index);
|
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
opMenu.permission,
|
|
9
9
|
`${moduleName}:${serviceName}:${opMenu.permission}`,
|
|
10
10
|
]">
|
|
11
|
-
{{ opMenu.text
|
|
11
|
+
{{ opMenu.text }}
|
|
12
12
|
</el-button>
|
|
13
13
|
</el-col>
|
|
14
14
|
</template>
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
opMenu.permission,
|
|
21
21
|
`${moduleName}:${serviceName}:${opMenu.permission}`,
|
|
22
22
|
]">
|
|
23
|
-
{{ opMenu.text
|
|
23
|
+
{{ opMenu.text }}
|
|
24
24
|
</el-button>
|
|
25
25
|
</el-col>
|
|
26
26
|
</template>
|
|
@@ -69,7 +69,7 @@ export default {
|
|
|
69
69
|
default:()=>[
|
|
70
70
|
{
|
|
71
71
|
visible: true,
|
|
72
|
-
|
|
72
|
+
text: "添加",
|
|
73
73
|
icon: "el-icon-plus",
|
|
74
74
|
permission: "add",
|
|
75
75
|
name: "add",
|
|
@@ -79,7 +79,7 @@ export default {
|
|
|
79
79
|
},
|
|
80
80
|
{
|
|
81
81
|
visible: true,
|
|
82
|
-
|
|
82
|
+
text: "修改",
|
|
83
83
|
icon: "el-icon-edit",
|
|
84
84
|
permission: "edit",
|
|
85
85
|
name: "update",
|
|
@@ -89,7 +89,7 @@ export default {
|
|
|
89
89
|
},
|
|
90
90
|
{
|
|
91
91
|
visible: true,
|
|
92
|
-
|
|
92
|
+
text: "删除",
|
|
93
93
|
icon: "el-icon-delete",
|
|
94
94
|
permission: "remove",
|
|
95
95
|
name: "delete",
|
|
@@ -36,6 +36,7 @@
|
|
|
36
36
|
format="HH:mm"
|
|
37
37
|
value-format="HH:mm"
|
|
38
38
|
@change="onChangeEvent"
|
|
39
|
+
placeholder="选择时间"
|
|
39
40
|
>
|
|
40
41
|
</el-time-picker>
|
|
41
42
|
</el-form-item>
|
|
@@ -72,13 +73,13 @@ export default class DatePicker extends Vue {
|
|
|
72
73
|
public currentValue = (this as any).value;
|
|
73
74
|
public type = "date";
|
|
74
75
|
public placeholder =
|
|
75
|
-
(this as any).setting && (this as any).setting.range ? "false" :
|
|
76
|
+
(this as any).setting && (this as any).setting.range ? "false" : "选择日期";
|
|
76
77
|
public rangeSeparator =
|
|
77
|
-
(this as any).setting && (this as any).setting.range ?
|
|
78
|
+
(this as any).setting && (this as any).setting.range ? "至" : "-";
|
|
78
79
|
public startPlaceholder =
|
|
79
|
-
(this as any).setting && (this as any).setting.range ?
|
|
80
|
+
(this as any).setting && (this as any).setting.range ? "开始日期" : "";
|
|
80
81
|
public endPlaceholder =
|
|
81
|
-
(this as any).setting && (this as any).setting.range ?
|
|
82
|
+
(this as any).setting && (this as any).setting.range ? "结束日期" : "";
|
|
82
83
|
|
|
83
84
|
created() {
|
|
84
85
|
if (this.value) {
|
|
@@ -40,7 +40,7 @@
|
|
|
40
40
|
:disabled="disabled ? true : column.disabled ? true : false"
|
|
41
41
|
:filterable="filterable"
|
|
42
42
|
:remote="remote"
|
|
43
|
-
:placeholder="column.placeholder ? column.placeholder :
|
|
43
|
+
:placeholder="column.placeholder ? column.placeholder : '请选择'"
|
|
44
44
|
:remote-method="remoteMethod"
|
|
45
45
|
:loading="remote ? loading : false"
|
|
46
46
|
:multiple="multiple"
|
|
@@ -66,7 +66,7 @@
|
|
|
66
66
|
:options="data"
|
|
67
67
|
@input="updateValue"
|
|
68
68
|
:normalizer="normalizer"
|
|
69
|
-
|
|
69
|
+
placeholder="请选择"
|
|
70
70
|
/>
|
|
71
71
|
</el-form-item>
|
|
72
72
|
|
|
@@ -96,7 +96,7 @@
|
|
|
96
96
|
<el-input
|
|
97
97
|
slot="reference"
|
|
98
98
|
v-model="input"
|
|
99
|
-
|
|
99
|
+
placeholder="请输入内容"
|
|
100
100
|
@input="inputChange"
|
|
101
101
|
></el-input>
|
|
102
102
|
</el-popover>
|
|
@@ -140,7 +140,7 @@
|
|
|
140
140
|
:options="data"
|
|
141
141
|
@input="updateValue"
|
|
142
142
|
:normalizer="normalizer"
|
|
143
|
-
|
|
143
|
+
placeholder="请选择"
|
|
144
144
|
/>
|
|
145
145
|
</el-form-item>
|
|
146
146
|
</template>
|
|
@@ -628,7 +628,7 @@ export default class dropDownList extends Vue {
|
|
|
628
628
|
"dictLabel",
|
|
629
629
|
"dictValue"
|
|
630
630
|
);
|
|
631
|
-
let newitems = [{ text: this.setting.allName?this.setting.allName:store.state.permission.allName?store.state.permission.allName:
|
|
631
|
+
let newitems = [{ text: this.setting.allName?this.setting.allName:store.state.permission.allName?store.state.permission.allName:"---请选择---", value: undefined }];
|
|
632
632
|
items.forEach((item) => {
|
|
633
633
|
if (item.text.indexOf(this.setting.findValue) != -1) {
|
|
634
634
|
newitems.push(item);
|
|
@@ -733,7 +733,7 @@ export default class dropDownList extends Vue {
|
|
|
733
733
|
this.setting.displayField || "componentName",
|
|
734
734
|
this.setting.valueField || "id"
|
|
735
735
|
);
|
|
736
|
-
let newitems = [{ text:this.setting.allName?this.setting.allName:store.state.permission.allName?store.state.permission.allName:
|
|
736
|
+
let newitems = [{ text:this.setting.allName?this.setting.allName:store.state.permission.allName?store.state.permission.allName:"---请选择---", value: undefined }];
|
|
737
737
|
items.forEach((item: any) => {
|
|
738
738
|
if (item.value) {
|
|
739
739
|
if (
|
|
@@ -836,7 +836,7 @@ export default class dropDownList extends Vue {
|
|
|
836
836
|
if (!valueField) valueField = this.setting.valueField;
|
|
837
837
|
var items = [];
|
|
838
838
|
if (this.setting.isShowPleaseChoose != false)
|
|
839
|
-
items.push({ text:this.setting.allName?this.setting.allName:store.state.permission.allName?store.state.permission.allName:
|
|
839
|
+
items.push({ text:this.setting.allName?this.setting.allName:store.state.permission.allName?store.state.permission.allName:"---请选择---", value: undefined });
|
|
840
840
|
if (source) {
|
|
841
841
|
this.itemList = source;
|
|
842
842
|
for (var item of source) {
|
|
@@ -845,7 +845,7 @@ export default class dropDownList extends Vue {
|
|
|
845
845
|
}
|
|
846
846
|
/*console.log("下拉",items);*/
|
|
847
847
|
if (this.column.setting && this.column.setting.chooseFirst) {
|
|
848
|
-
if (items[0].text ==this.setting.allName?this.setting.allName:store.state.permission.allName?store.state.permission.allName:
|
|
848
|
+
if (items[0].text ==this.setting.allName?this.setting.allName:store.state.permission.allName?store.state.permission.allName:"---请选择---" || items[0].text == "请选择") {
|
|
849
849
|
this.$set(this.entity, String(this.column.property), items[1].text);
|
|
850
850
|
this.onChangeEvent(this.entity[this.column.property], true);
|
|
851
851
|
} else {
|
|
@@ -26,9 +26,9 @@
|
|
|
26
26
|
type="primary"
|
|
27
27
|
:loading="tableSetting.submitLoading"
|
|
28
28
|
@click="submitForm"
|
|
29
|
-
|
|
29
|
+
>确 定</el-button
|
|
30
30
|
>
|
|
31
|
-
<el-button @click="cancel"
|
|
31
|
+
<el-button @click="cancel">取 消</el-button>
|
|
32
32
|
</div>
|
|
33
33
|
</slot>
|
|
34
34
|
</div>
|
|
@@ -59,7 +59,7 @@ export default class lookupDialog extends Vue {
|
|
|
59
59
|
// 提交状态
|
|
60
60
|
submitLoading: false,
|
|
61
61
|
// 弹出层标题
|
|
62
|
-
title:
|
|
62
|
+
title: "请选择",
|
|
63
63
|
// 保存时是否自动关闭
|
|
64
64
|
isCloseOnSave: true,
|
|
65
65
|
// 启用多选模式
|