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
|
@@ -26,7 +26,7 @@
|
|
|
26
26
|
size=""
|
|
27
27
|
:disabled="!currentEntity"
|
|
28
28
|
@click="print"
|
|
29
|
-
|
|
29
|
+
>打 印</el-button
|
|
30
30
|
>
|
|
31
31
|
<el-button
|
|
32
32
|
type="primary"
|
|
@@ -35,10 +35,10 @@
|
|
|
35
35
|
size=""
|
|
36
36
|
:disabled="!currentEntity"
|
|
37
37
|
@click="printView"
|
|
38
|
-
|
|
38
|
+
>打 印 预 览</el-button
|
|
39
39
|
>
|
|
40
|
-
<el-button @click="cancel"
|
|
41
|
-
<el-button @click="downloadPrintClient"
|
|
40
|
+
<el-button @click="cancel">取 消</el-button>
|
|
41
|
+
<el-button @click="downloadPrintClient">下载打印插件</el-button>
|
|
42
42
|
</div>
|
|
43
43
|
</el-dialog>
|
|
44
44
|
</template>
|
|
@@ -83,7 +83,7 @@ export default class printDialog extends Vue {
|
|
|
83
83
|
// 提交状态
|
|
84
84
|
submitLoading: false,
|
|
85
85
|
// 弹出层标题
|
|
86
|
-
title:
|
|
86
|
+
title: "请选择",
|
|
87
87
|
// 保存时是否自动关闭
|
|
88
88
|
isCloseOnSave: true,
|
|
89
89
|
// 启用多选模式
|
|
@@ -114,38 +114,38 @@ export default class printDialog extends Vue {
|
|
|
114
114
|
},
|
|
115
115
|
// 列表列信息
|
|
116
116
|
listColumns: [
|
|
117
|
-
{ key: 0, text:
|
|
118
|
-
{ key: 1, text:
|
|
119
|
-
{ key: 2, text:
|
|
117
|
+
{ key: 0, text: `序号`, property: "id", visible: true },
|
|
118
|
+
{ key: 1, text: `模板编号`, property: "templateNo", visible: true },
|
|
119
|
+
{ key: 2, text: `模板名称`, property: "templateName", visible: true },
|
|
120
120
|
{
|
|
121
121
|
key: 3,
|
|
122
|
-
text:
|
|
122
|
+
text: `模板类型`,
|
|
123
123
|
property: "templateType",
|
|
124
124
|
visible: true,
|
|
125
125
|
setting: { dictType: "sys_template_type" },
|
|
126
126
|
},
|
|
127
127
|
{
|
|
128
128
|
key: 4,
|
|
129
|
-
text:
|
|
129
|
+
text: `模板内容`,
|
|
130
130
|
property: "templateContent",
|
|
131
131
|
visible: true,
|
|
132
132
|
},
|
|
133
|
-
{ key: 5, text:
|
|
133
|
+
{ key: 5, text: `模板设置`, property: "setting", visible: true },
|
|
134
134
|
{
|
|
135
135
|
key: 6,
|
|
136
|
-
text:
|
|
136
|
+
text: `模板版本号`,
|
|
137
137
|
property: "templateDescribe",
|
|
138
138
|
visible: true,
|
|
139
139
|
},
|
|
140
140
|
{
|
|
141
141
|
key: 7,
|
|
142
|
-
text:
|
|
142
|
+
text: `模板描述`,
|
|
143
143
|
property: "templateDescribe",
|
|
144
144
|
visible: true,
|
|
145
145
|
},
|
|
146
146
|
{
|
|
147
147
|
key: 8,
|
|
148
|
-
text:
|
|
148
|
+
text: `状态`,
|
|
149
149
|
property: "templateStatus",
|
|
150
150
|
setting: { dictType: "sys_template_status" },
|
|
151
151
|
},
|
|
@@ -154,7 +154,7 @@ export default class printDialog extends Vue {
|
|
|
154
154
|
// 列表查询条件
|
|
155
155
|
searchRules: [
|
|
156
156
|
{
|
|
157
|
-
text:
|
|
157
|
+
text: `模板类型`,
|
|
158
158
|
property: "templateType",
|
|
159
159
|
displayType: "DropDownList",
|
|
160
160
|
setting: { dictType: "sys_template_type" },
|
|
@@ -162,12 +162,12 @@ export default class printDialog extends Vue {
|
|
|
162
162
|
},
|
|
163
163
|
|
|
164
164
|
// {
|
|
165
|
-
// text:
|
|
165
|
+
// text: `模板类型`,
|
|
166
166
|
// property: "templateType",
|
|
167
167
|
// visible: false,
|
|
168
168
|
// value: this.templateType,
|
|
169
169
|
// },
|
|
170
|
-
{ text:
|
|
170
|
+
{ text: `模板名称`, property: "templateName" },
|
|
171
171
|
],
|
|
172
172
|
//弹框是否显示确定 取消
|
|
173
173
|
footerButton: true,
|
|
@@ -22,9 +22,9 @@
|
|
|
22
22
|
type="primary"
|
|
23
23
|
:loading="setting.submitLoading"
|
|
24
24
|
@click="submitForm"
|
|
25
|
-
|
|
25
|
+
>确 定</el-button
|
|
26
26
|
>
|
|
27
|
-
<el-button @click="cancel"
|
|
27
|
+
<el-button @click="cancel">取 消</el-button>
|
|
28
28
|
</div>
|
|
29
29
|
</div>
|
|
30
30
|
</template>
|
|
@@ -67,7 +67,7 @@ export default {
|
|
|
67
67
|
name: "basic",
|
|
68
68
|
visable: true,
|
|
69
69
|
icon: "ion-plus-round",
|
|
70
|
-
text:
|
|
70
|
+
text: "基本信息",
|
|
71
71
|
type: "area",
|
|
72
72
|
},
|
|
73
73
|
{
|
|
@@ -116,10 +116,10 @@
|
|
|
116
116
|
icon="el-icon-search"
|
|
117
117
|
size="mini"
|
|
118
118
|
@click="handleQuery"
|
|
119
|
-
|
|
119
|
+
>搜索</el-button
|
|
120
120
|
>
|
|
121
121
|
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
|
|
122
|
-
|
|
122
|
+
>重置</el-button
|
|
123
123
|
>
|
|
124
124
|
</el-form-item>
|
|
125
125
|
</el-form>
|
|
@@ -144,7 +144,7 @@
|
|
|
144
144
|
<el-table-column
|
|
145
145
|
v-if="listSetting.isShowIndexColumn == true"
|
|
146
146
|
type="index"
|
|
147
|
-
|
|
147
|
+
label="序号"
|
|
148
148
|
width="50"
|
|
149
149
|
align="center"
|
|
150
150
|
>
|
|
@@ -250,7 +250,7 @@
|
|
|
250
250
|
</template>
|
|
251
251
|
|
|
252
252
|
<el-table-column
|
|
253
|
-
|
|
253
|
+
label="操作"
|
|
254
254
|
align="center"
|
|
255
255
|
min-width="160"
|
|
256
256
|
class-name="small-padding fixed-width"
|
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
<!-- <el-table-column v-if="listSetting.isShowIndex != false" type="index" prop="index" label="序号" width="50"
|
|
10
10
|
align="center">
|
|
11
11
|
</el-table-column> -->
|
|
12
|
-
<el-table-column v-if="listSetting.isShowIndexColumn != false" type="index" prop="index"
|
|
12
|
+
<el-table-column v-if="listSetting.isShowIndexColumn != false" type="index" prop="index" label="序号" width="50"
|
|
13
13
|
align="center">
|
|
14
14
|
<template scope="scope">
|
|
15
15
|
<span>{{
|
|
@@ -202,7 +202,7 @@
|
|
|
202
202
|
</el-table-column>
|
|
203
203
|
</template>
|
|
204
204
|
|
|
205
|
-
<el-table-column
|
|
205
|
+
<el-table-column label="操作" align="center" min-width="160" class-name="small-padding fixed-width"
|
|
206
206
|
v-if="listSetting.isShowOpColumn">
|
|
207
207
|
<template slot-scope="scope">
|
|
208
208
|
<el-button v-for="(opMenu, index) in listCustomOpMenus" :key="index" size="mini" type="text" :icon="opMenu.icon"
|
|
@@ -478,7 +478,7 @@ export default class table extends Vue {
|
|
|
478
478
|
}
|
|
479
479
|
/** 自定义列显示格式方法 */
|
|
480
480
|
remarkFormat(data, column) {
|
|
481
|
-
return data.remark ?
|
|
481
|
+
return data.remark ? "有备注" : "无备注";
|
|
482
482
|
}
|
|
483
483
|
/** 自定义列点击方法 */
|
|
484
484
|
onFilePriview(data, column) {
|
|
@@ -486,7 +486,7 @@ export default class table extends Vue {
|
|
|
486
486
|
}
|
|
487
487
|
/** 自定义列显示Html */
|
|
488
488
|
getFilePriviewLink(data, column) {
|
|
489
|
-
return `<a href="${getFilePriviewUrl(data.remark)}" target="_blank">${data.remark ?
|
|
489
|
+
return `<a href="${getFilePriviewUrl(data.remark)}" target="_blank">${data.remark ? "自定义预览" : ""
|
|
490
490
|
}</a>`;
|
|
491
491
|
}
|
|
492
492
|
//列表点击属性字段点击
|
|
@@ -513,7 +513,7 @@ export default class table extends Vue {
|
|
|
513
513
|
});
|
|
514
514
|
columns.forEach((column, index) => {
|
|
515
515
|
if (index === 0) {
|
|
516
|
-
sums[index] =
|
|
516
|
+
sums[index] = "合计";
|
|
517
517
|
return;
|
|
518
518
|
}
|
|
519
519
|
if (sumColumns.indexOf(column.property) < 0) {
|
|
@@ -27,7 +27,7 @@
|
|
|
27
27
|
</el-form-item>
|
|
28
28
|
<!-- 字数统计显示:仅当 showWordCount 为 true 时显示 -->
|
|
29
29
|
<div v-if="column.showWordCount" class="word-count">
|
|
30
|
-
{{ currentLength }} / {{ column.maxLength ||
|
|
30
|
+
{{ currentLength }} / {{ column.maxLength || '不限' }}
|
|
31
31
|
</div>
|
|
32
32
|
</div>
|
|
33
33
|
</template>
|
|
@@ -352,7 +352,7 @@ export default class upload extends Vue {
|
|
|
352
352
|
}
|
|
353
353
|
return;
|
|
354
354
|
}
|
|
355
|
-
(this as any).$message.success(
|
|
355
|
+
(this as any).$message.success("上传成功");
|
|
356
356
|
this.fileList.push({
|
|
357
357
|
name: res.data.materialNick,
|
|
358
358
|
url: res.data.materialUrl,
|
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
:before-upload="handleBeforeUpload" :data="{ folderId: '0' }" :limit="limit" :on-error="handleUploadError"
|
|
12
12
|
:on-exceed="handleExceed" :on-success="handleUploadSuccess" :headers="headers" :on-progress='handleProgress'
|
|
13
13
|
ref="upload" :on-remove="handleRemove" multiple :file-list="fileList">
|
|
14
|
-
<el-button size="small" type="primary"
|
|
14
|
+
<el-button size="small" type="primary">点击上传</el-button>
|
|
15
15
|
</el-upload>
|
|
16
16
|
<el-dialog :visible.sync="dialogVisible">
|
|
17
17
|
<img width="100%" :src="dialogImageUrl" alt="">
|
|
@@ -35,7 +35,7 @@
|
|
|
35
35
|
:underline="false"
|
|
36
36
|
@click="handleDelete(index)"
|
|
37
37
|
type="danger"
|
|
38
|
-
|
|
38
|
+
>删除</el-link
|
|
39
39
|
>
|
|
40
40
|
</div>
|
|
41
41
|
</li>
|
|
@@ -205,7 +205,7 @@ export default class upload extends Vue {
|
|
|
205
205
|
});
|
|
206
206
|
if (!isTypeOk) {
|
|
207
207
|
(this as any).$message.error(
|
|
208
|
-
|
|
208
|
+
`文件格式不正确, 请上传${this.fileType.join("/")}格式文件!`
|
|
209
209
|
);
|
|
210
210
|
return false;
|
|
211
211
|
}
|
|
@@ -215,7 +215,7 @@ export default class upload extends Vue {
|
|
|
215
215
|
const isLt = file.size / 1024 / 1024 < this.fileSize;
|
|
216
216
|
if (!isLt) {
|
|
217
217
|
(this as any).$message.error(
|
|
218
|
-
|
|
218
|
+
`上传文件大小不能超过 ${this.fileSize} MB!`
|
|
219
219
|
);
|
|
220
220
|
return false;
|
|
221
221
|
}
|
|
@@ -224,12 +224,12 @@ export default class upload extends Vue {
|
|
|
224
224
|
}
|
|
225
225
|
// 文件个数超出
|
|
226
226
|
public handleExceed() {
|
|
227
|
-
(this as any).$message.error(
|
|
227
|
+
(this as any).$message.error(`上传文件数量不能超过 ${this.limit} 个!`);
|
|
228
228
|
}
|
|
229
229
|
// 上传失败
|
|
230
230
|
public handleUploadError(err) {
|
|
231
231
|
|
|
232
|
-
(this as any).$message.error(
|
|
232
|
+
(this as any).$message.error("上传失败, 请重试");
|
|
233
233
|
|
|
234
234
|
}
|
|
235
235
|
// 上传成功回调
|
|
@@ -258,7 +258,7 @@ export default class upload extends Vue {
|
|
|
258
258
|
}
|
|
259
259
|
return
|
|
260
260
|
}
|
|
261
|
-
(this as any).$message.success(
|
|
261
|
+
(this as any).$message.success("上传成功")
|
|
262
262
|
this.fileList.push({
|
|
263
263
|
name: file.name,
|
|
264
264
|
url: res.data.materialUrl,
|
|
@@ -87,7 +87,7 @@ export default class uploadDialog extends Vue {
|
|
|
87
87
|
this.setting.open = false;
|
|
88
88
|
this.setting.isUploading = false;
|
|
89
89
|
(this.$refs.setting as any).clearFiles();
|
|
90
|
-
(this as any).$alert(response.msg,
|
|
90
|
+
(this as any).$alert(response.msg, "导入结果", {
|
|
91
91
|
dangerouslyUseHTMLString: true,
|
|
92
92
|
});
|
|
93
93
|
this.$emit("onImportSuccess", null);
|
|
@@ -63,10 +63,10 @@
|
|
|
63
63
|
icon="el-icon-search"
|
|
64
64
|
size="mini"
|
|
65
65
|
@click="handleQuery"
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
66
|
+
>搜索</el-button
|
|
67
|
+
>
|
|
68
|
+
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
|
|
69
|
+
>重置</el-button
|
|
70
70
|
>
|
|
71
71
|
</el-form-item>
|
|
72
72
|
</el-form>
|
|
@@ -137,12 +137,12 @@
|
|
|
137
137
|
align="center"
|
|
138
138
|
/>
|
|
139
139
|
<el-table-column
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
140
|
+
v-if="listSetting.isShowIndexColumn != false"
|
|
141
|
+
type="index"
|
|
142
|
+
label="序号"
|
|
143
|
+
width="50"
|
|
144
|
+
align="center"
|
|
145
|
+
>
|
|
146
146
|
<template scope="scope">
|
|
147
147
|
<span>{{
|
|
148
148
|
(listQueryParams.pageNum - 1) * listQueryParams.pageSize +
|
|
@@ -256,7 +256,7 @@
|
|
|
256
256
|
</template>
|
|
257
257
|
|
|
258
258
|
<el-table-column
|
|
259
|
-
|
|
259
|
+
label="操作"
|
|
260
260
|
align="center"
|
|
261
261
|
min-width="160"
|
|
262
262
|
class-name="small-padding fixed-width"
|
|
@@ -323,13 +323,13 @@
|
|
|
323
323
|
icon="el-icon-search"
|
|
324
324
|
size="mini"
|
|
325
325
|
@click="doubleHandleQuery(dex)"
|
|
326
|
-
|
|
326
|
+
>搜索</el-button
|
|
327
327
|
>
|
|
328
328
|
<el-button
|
|
329
329
|
icon="el-icon-refresh"
|
|
330
330
|
size="mini"
|
|
331
331
|
@click="doubleResetQuery(dex)"
|
|
332
|
-
|
|
332
|
+
>重置</el-button
|
|
333
333
|
>
|
|
334
334
|
</el-form-item>
|
|
335
335
|
</el-form>
|
|
@@ -376,7 +376,7 @@
|
|
|
376
376
|
<el-table-column
|
|
377
377
|
v-if="tableSetting[dex].isShowIndexColumn != false"
|
|
378
378
|
type="index"
|
|
379
|
-
|
|
379
|
+
label="序号"
|
|
380
380
|
width="50"
|
|
381
381
|
align="center"
|
|
382
382
|
>
|
|
@@ -498,7 +498,7 @@
|
|
|
498
498
|
</template>
|
|
499
499
|
|
|
500
500
|
<el-table-column
|
|
501
|
-
|
|
501
|
+
label="操作"
|
|
502
502
|
align="center"
|
|
503
503
|
min-width="160"
|
|
504
504
|
class-name="small-padding fixed-width"
|
|
@@ -1017,7 +1017,7 @@ export default class doubleBasePageTs extends ListBasePage {
|
|
|
1017
1017
|
);
|
|
1018
1018
|
console.log(this.tableSetting[0].listColumns);
|
|
1019
1019
|
} else {
|
|
1020
|
-
this.msgError(
|
|
1020
|
+
this.msgError("数据错误!");
|
|
1021
1021
|
}
|
|
1022
1022
|
});
|
|
1023
1023
|
}
|