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
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
<div class="head-container">
|
|
8
8
|
<el-input
|
|
9
9
|
v-model="deptName"
|
|
10
|
-
|
|
10
|
+
placeholder="请输入部门名称"
|
|
11
11
|
clearable
|
|
12
12
|
size="small"
|
|
13
13
|
prefix-icon="el-icon-search"
|
|
@@ -32,26 +32,26 @@
|
|
|
32
32
|
<el-col :span="20" :xs="24">
|
|
33
33
|
<div class="wrapper-container" v-show="showSearch">
|
|
34
34
|
<el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
|
|
35
|
-
<el-form-item
|
|
35
|
+
<el-form-item label="岗位编码" prop="postCode">
|
|
36
36
|
<el-input
|
|
37
37
|
v-model="queryParams.postCode"
|
|
38
|
-
|
|
38
|
+
placeholder="请输入岗位编码"
|
|
39
39
|
clearable
|
|
40
40
|
size="small"
|
|
41
41
|
@keyup.enter.native="handleQuery"
|
|
42
42
|
/>
|
|
43
43
|
</el-form-item>
|
|
44
|
-
<el-form-item
|
|
44
|
+
<el-form-item label="岗位名称" prop="postName">
|
|
45
45
|
<el-input
|
|
46
46
|
v-model="queryParams.postName"
|
|
47
|
-
|
|
47
|
+
placeholder="请输入岗位名称"
|
|
48
48
|
clearable
|
|
49
49
|
size="small"
|
|
50
50
|
@keyup.enter.native="handleQuery"
|
|
51
51
|
/>
|
|
52
52
|
</el-form-item>
|
|
53
|
-
<el-form-item
|
|
54
|
-
<el-select v-model="queryParams.status"
|
|
53
|
+
<el-form-item label="状态" prop="status">
|
|
54
|
+
<el-select v-model="queryParams.status" placeholder="岗位状态" clearable size="small">
|
|
55
55
|
<el-option
|
|
56
56
|
v-for="dict in statusOptions"
|
|
57
57
|
:key="dict.dictValue"
|
|
@@ -61,8 +61,8 @@
|
|
|
61
61
|
</el-select>
|
|
62
62
|
</el-form-item>
|
|
63
63
|
<el-form-item>
|
|
64
|
-
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"
|
|
65
|
-
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
|
|
64
|
+
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
|
65
|
+
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
|
66
66
|
</el-form-item>
|
|
67
67
|
</el-form>
|
|
68
68
|
</div>
|
|
@@ -70,12 +70,12 @@
|
|
|
70
70
|
<div class="wrapper-container">
|
|
71
71
|
<el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
|
|
72
72
|
<el-table-column type="selection" width="50" align="center" />
|
|
73
|
-
<el-table-column
|
|
74
|
-
<el-table-column
|
|
73
|
+
<el-table-column label="岗位编码" align="center" prop="postCode" key="postCode" v-if="columns[0].visible" min-width="120"/>
|
|
74
|
+
<el-table-column label="岗位名称" align="center" prop="postName" key="postName" v-if="columns[1].visible"
|
|
75
75
|
:show-overflow-tooltip="true" min-width="120"/>
|
|
76
|
-
<el-table-column
|
|
76
|
+
<el-table-column label="归属部门" align="center" prop="dept.deptName" key="dept.deptName"
|
|
77
77
|
v-if="columns[2].visible" :show-overflow-tooltip="true" min-width="120"/>
|
|
78
|
-
<el-table-column
|
|
78
|
+
<el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" key="status"
|
|
79
79
|
v-if="columns[3].visible" :show-overflow-tooltip="true" min-width="120">
|
|
80
80
|
<template slot-scope="scope">
|
|
81
81
|
<el-switch
|
|
@@ -86,7 +86,7 @@
|
|
|
86
86
|
></el-switch>
|
|
87
87
|
</template>
|
|
88
88
|
</el-table-column>
|
|
89
|
-
<el-table-column
|
|
89
|
+
<el-table-column label="创建时间" align="center" prop="createTime" min-width="180" key="createTime"
|
|
90
90
|
v-if="columns[4].visible" :show-overflow-tooltip="true">
|
|
91
91
|
<template slot-scope="scope">
|
|
92
92
|
<span>{{ parseTime(scope.row.createTime) }}</span>
|
|
@@ -148,24 +148,24 @@ export default {
|
|
|
148
148
|
},
|
|
149
149
|
// 列信息
|
|
150
150
|
columns: [
|
|
151
|
-
{key: 0, label:
|
|
152
|
-
{key: 1, label:
|
|
153
|
-
{key: 2, label:
|
|
154
|
-
{key: 3, label:
|
|
155
|
-
{key: 4, label:
|
|
151
|
+
{key: 0, label: `岗位编码`, visible: true},
|
|
152
|
+
{key: 1, label: `岗位名称`, visible: true},
|
|
153
|
+
{key: 2, label: `归属部门`, visible: true},
|
|
154
|
+
{key: 3, label: `状态`, visible: true},
|
|
155
|
+
{key: 4, label: `创建时间`, visible: true}
|
|
156
156
|
],
|
|
157
157
|
// 表单参数
|
|
158
158
|
form: {},
|
|
159
159
|
// 表单校验
|
|
160
160
|
rules: {
|
|
161
161
|
deptId: [
|
|
162
|
-
{required: true, message:
|
|
162
|
+
{required: true, message: "归属部门不能为空", trigger: "blur"}
|
|
163
163
|
],
|
|
164
164
|
postCode: [
|
|
165
|
-
{required: true, message:
|
|
165
|
+
{required: true, message: "岗位编码不能为空", trigger: "blur"}
|
|
166
166
|
],
|
|
167
167
|
postName: [
|
|
168
|
-
{required: true, message:
|
|
168
|
+
{required: true, message: "岗位名称不能为空", trigger: "blur"}
|
|
169
169
|
]
|
|
170
170
|
},
|
|
171
171
|
// 部门树选项
|
|
@@ -11,20 +11,20 @@ export default class ProjectList extends ListBasePage {
|
|
|
11
11
|
// 列表列信息
|
|
12
12
|
listColumns = [
|
|
13
13
|
//{key: 0, label: "序号", visible: true},
|
|
14
|
-
{text:
|
|
15
|
-
{text:
|
|
14
|
+
{text: "项目编号", property: "projectNo"},
|
|
15
|
+
{text: "项目名称", property: "projectName"},
|
|
16
16
|
];
|
|
17
17
|
//是否多选
|
|
18
18
|
isMultiple = true;
|
|
19
19
|
// 查询条件
|
|
20
20
|
searchRules = [
|
|
21
|
-
{text:
|
|
22
|
-
{text:
|
|
21
|
+
{text: "项目编号", op: "LI", property: "projectNo", displayType: "TextBox"},
|
|
22
|
+
{text: "项目名称", op: "LI", property: "projectName", displayType: "TextBox"},
|
|
23
23
|
];
|
|
24
24
|
// 列信息
|
|
25
25
|
editColumns = [
|
|
26
|
-
{text:
|
|
27
|
-
{text:
|
|
26
|
+
{text: "项目编号", property: "projectNo", displayType: "TextBox"},
|
|
27
|
+
{text: "项目名称", property: "projectName", displayType: "TextBox"},
|
|
28
28
|
];
|
|
29
29
|
opMenus = [
|
|
30
30
|
];
|
|
@@ -51,10 +51,10 @@ export default class ProjectList extends ListBasePage {
|
|
|
51
51
|
// 表单校验
|
|
52
52
|
editRules = {
|
|
53
53
|
projectNo: [
|
|
54
|
-
{required: true, message:
|
|
54
|
+
{required: true, message: "项目编号不能为空", trigger: "blur"}
|
|
55
55
|
],
|
|
56
56
|
projectName: [
|
|
57
|
-
{required: true, message:
|
|
57
|
+
{required: true, message: "项目名称不能为空", trigger: "blur"}
|
|
58
58
|
],
|
|
59
59
|
};
|
|
60
60
|
mounted() {
|
|
@@ -26,17 +26,17 @@ export default class SalesmanInfoModel extends ListLocalDataPage {
|
|
|
26
26
|
// 列表列信息
|
|
27
27
|
listColumns = [
|
|
28
28
|
//{key: 0, label: "序号", visible: true},
|
|
29
|
-
{ text:
|
|
30
|
-
{ text:
|
|
31
|
-
{ text:
|
|
29
|
+
{ text: "员工编号", property: "employeeNo" },
|
|
30
|
+
{ text: "员工姓名", property: "employeeName" },
|
|
31
|
+
{ text: "备注", property: "remark" },
|
|
32
32
|
];
|
|
33
33
|
// 列信息
|
|
34
34
|
editColumns = [
|
|
35
35
|
{
|
|
36
|
-
text:
|
|
36
|
+
text: "客户ID", property: "customerId", displayType: "TextBox", disabled: true
|
|
37
37
|
},
|
|
38
38
|
{
|
|
39
|
-
text:
|
|
39
|
+
text: "员工选择", property: "employeeId", displayType: "DropDownList",
|
|
40
40
|
setting: {
|
|
41
41
|
url: "/bd/employee/list",
|
|
42
42
|
//指定显示字段和取值字段
|
|
@@ -44,13 +44,13 @@ export default class SalesmanInfoModel extends ListLocalDataPage {
|
|
|
44
44
|
valueField: "id"
|
|
45
45
|
}
|
|
46
46
|
},
|
|
47
|
-
{ text:
|
|
47
|
+
{ text: "备注", property: "remark", displayType: "TextBox" },
|
|
48
48
|
];
|
|
49
49
|
|
|
50
50
|
// 表单校验
|
|
51
51
|
editRules = {
|
|
52
52
|
employeeId: [
|
|
53
|
-
{ required: true, message:
|
|
53
|
+
{ required: true, message: "员工不可为空", trigger: "blur" }
|
|
54
54
|
],
|
|
55
55
|
};
|
|
56
56
|
created() {
|
|
@@ -9,15 +9,26 @@ export default class VendorList extends ListBasePage {
|
|
|
9
9
|
serviceName = "Vendor";
|
|
10
10
|
pkField = "id";
|
|
11
11
|
// 列表列信息
|
|
12
|
-
listColumns = [
|
|
12
|
+
listColumns = [
|
|
13
|
+
//{key: 0, label: "序号", visible: true},
|
|
14
|
+
{text: "供应商编号", property: "vendorNo"},
|
|
15
|
+
{text: "供应商名称", property: "vendorName"},
|
|
16
|
+
];
|
|
13
17
|
//是否多选
|
|
14
18
|
isMultiple = true;
|
|
15
19
|
// 查询条件
|
|
16
|
-
searchRules = [
|
|
20
|
+
searchRules = [
|
|
21
|
+
{text: "供应商编号", op: "LI", property: "vendorNo", displayType: "TextBox"},
|
|
22
|
+
{text: "供应商名称", op: "LI", property: "vendorName", displayType: "TextBox"},
|
|
23
|
+
];
|
|
17
24
|
// 列信息
|
|
18
|
-
editColumns = [
|
|
19
|
-
|
|
20
|
-
|
|
25
|
+
editColumns = [
|
|
26
|
+
{text: "供应商编号", property: "vendorNo", displayType: "TextBox"},
|
|
27
|
+
{text: "供应商名称", property: "vendorName", displayType: "TextBox"},
|
|
28
|
+
];
|
|
29
|
+
opMenus = [
|
|
30
|
+
];
|
|
31
|
+
listSetting = {
|
|
21
32
|
//获取列表数据的api方法名
|
|
22
33
|
getListAction: "list",
|
|
23
34
|
//主键字段
|
|
@@ -38,29 +49,14 @@ export default class VendorList extends ListBasePage {
|
|
|
38
49
|
];
|
|
39
50
|
|
|
40
51
|
// 表单校验
|
|
41
|
-
editRules = {
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
{text: this.t('vendorModal.vendorName'), op: "LI", property: "vendorName", displayType: "TextBox"},
|
|
50
|
-
];
|
|
51
|
-
this.editColumns = [
|
|
52
|
-
{text: this.t('vendorModal.vendorNo'), property: "vendorNo", displayType: "TextBox"},
|
|
53
|
-
{text: this.t('vendorModal.vendorName'), property: "vendorName", displayType: "TextBox"},
|
|
54
|
-
];
|
|
55
|
-
this.editRules = {
|
|
56
|
-
vendorNo: [
|
|
57
|
-
{required: true, message: this.t('vendorModal.required.vendorNo'), trigger: "blur"}
|
|
58
|
-
],
|
|
59
|
-
vendorName: [
|
|
60
|
-
{required: true, message: this.t('vendorModal.required.vendorName'), trigger: "blur"}
|
|
61
|
-
],
|
|
62
|
-
};
|
|
63
|
-
}
|
|
52
|
+
editRules = {
|
|
53
|
+
vendorNo: [
|
|
54
|
+
{required: true, message: "供应商编号不能为空", trigger: "blur"}
|
|
55
|
+
],
|
|
56
|
+
vendorName: [
|
|
57
|
+
{required: true, message: "供应商名称不能为空", trigger: "blur"}
|
|
58
|
+
],
|
|
59
|
+
};
|
|
64
60
|
mounted() {
|
|
65
61
|
// 根据传参:multipleChoice 判断是否可以多选,不设值则基类默认false(单选)
|
|
66
62
|
if (!!this.value?.hasOwnProperty('multipleChoice')) {
|
|
@@ -9,15 +9,42 @@ export default class WorkGroupList extends ListBasePage {
|
|
|
9
9
|
serviceName = "WorkGroup";
|
|
10
10
|
pkField = "id";
|
|
11
11
|
// 列表列信息
|
|
12
|
-
listColumns = [
|
|
12
|
+
listColumns = [
|
|
13
|
+
//{key: 0, label: "序号", visible: true},
|
|
14
|
+
{text: "组织", property: "siteId", setting: { type: "Site" } },
|
|
15
|
+
{text: "班组编号", property: "workGroupNo"},
|
|
16
|
+
{text: "班组名称", property: "workGroupName"},
|
|
17
|
+
];
|
|
13
18
|
//是否多选
|
|
14
19
|
isMultiple = true;
|
|
15
20
|
// 查询条件
|
|
16
|
-
searchRules = [
|
|
21
|
+
searchRules = [
|
|
22
|
+
{
|
|
23
|
+
text: `组织`,
|
|
24
|
+
property: "siteId",
|
|
25
|
+
displayType: "DropDownList",
|
|
26
|
+
op:"EQ",
|
|
27
|
+
setting: {
|
|
28
|
+
type: "site",
|
|
29
|
+
url: "fd/fd/getUserSites",
|
|
30
|
+
displayField: "componentName",
|
|
31
|
+
valueField: "id",
|
|
32
|
+
isShowPleaseChoose: false,
|
|
33
|
+
},
|
|
34
|
+
siteId: this.value?.siteId,
|
|
35
|
+
disabled: !!this.value?.siteId
|
|
36
|
+
},
|
|
37
|
+
{text: "班组编号", op: "LI", property: "workGroupNo", displayType: "TextBox"},
|
|
38
|
+
{text: "班组名称", op: "LI", property: "workGroupName", displayType: "TextBox"},
|
|
39
|
+
];
|
|
17
40
|
// 列信息
|
|
18
|
-
editColumns = [
|
|
19
|
-
|
|
20
|
-
|
|
41
|
+
editColumns = [
|
|
42
|
+
{text: "班组编号", property: "workGroupNo", displayType: "TextBox"},
|
|
43
|
+
{text: "班组名称", property: "workGroupName", displayType: "TextBox"},
|
|
44
|
+
];
|
|
45
|
+
opMenus = [
|
|
46
|
+
];
|
|
47
|
+
listSetting = {
|
|
21
48
|
//获取列表数据的api方法名
|
|
22
49
|
getListAction: "list",
|
|
23
50
|
//主键字段
|
|
@@ -38,45 +65,14 @@ export default class WorkGroupList extends ListBasePage {
|
|
|
38
65
|
];
|
|
39
66
|
|
|
40
67
|
// 表单校验
|
|
41
|
-
editRules = {
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
{
|
|
47
|
-
]
|
|
48
|
-
|
|
49
|
-
{
|
|
50
|
-
text: this.t('workGroupModal.siteId'),
|
|
51
|
-
property: "siteId",
|
|
52
|
-
displayType: "DropDownList",
|
|
53
|
-
op:"EQ",
|
|
54
|
-
setting: {
|
|
55
|
-
type: "site",
|
|
56
|
-
url: "fd/fd/getUserSites",
|
|
57
|
-
displayField: "componentName",
|
|
58
|
-
valueField: "id",
|
|
59
|
-
isShowPleaseChoose: false,
|
|
60
|
-
},
|
|
61
|
-
siteId: this.value?.siteId,
|
|
62
|
-
disabled: !!this.value?.siteId
|
|
63
|
-
},
|
|
64
|
-
{text: this.t('workGroupModal.workGroupNo'), op: "LI", property: "workGroupNo", displayType: "TextBox"},
|
|
65
|
-
{text: this.t('workGroupModal.workGroupName'), op: "LI", property: "workGroupName", displayType: "TextBox"},
|
|
66
|
-
];
|
|
67
|
-
this.editColumns = [
|
|
68
|
-
{text: this.t('workGroupModal.workGroupNo'), property: "workGroupNo", displayType: "TextBox"},
|
|
69
|
-
{text: this.t('workGroupModal.workGroupName'), property: "workGroupName", displayType: "TextBox"},
|
|
70
|
-
];
|
|
71
|
-
this.editRules = {
|
|
72
|
-
workGroupNo: [
|
|
73
|
-
{required: true, message: this.t('workGroupModal.required.workGroupNo'), trigger: "blur"}
|
|
74
|
-
],
|
|
75
|
-
workGroupName: [
|
|
76
|
-
{required: true, message: this.t('workGroupModal.required.workGroupName'), trigger: "blur"}
|
|
77
|
-
],
|
|
78
|
-
};
|
|
79
|
-
}
|
|
68
|
+
editRules = {
|
|
69
|
+
vendorNo: [
|
|
70
|
+
{required: true, message: "班组编号不能为空", trigger: "blur"}
|
|
71
|
+
],
|
|
72
|
+
vendorName: [
|
|
73
|
+
{required: true, message: "班组名称不能为空", trigger: "blur"}
|
|
74
|
+
],
|
|
75
|
+
};
|
|
80
76
|
mounted() {
|
|
81
77
|
// 根据传参:multipleChoice 判断是否可以多选,不设值则基类默认false(单选)
|
|
82
78
|
if (!!this.value?.hasOwnProperty('multipleChoice')) {
|
|
@@ -11,30 +11,37 @@ export default class CustomerList extends ListBasePage {
|
|
|
11
11
|
// 列表列信息
|
|
12
12
|
listColumns = [
|
|
13
13
|
//{key: 0, label: "序号", visible: true},
|
|
14
|
-
{ text:
|
|
15
|
-
{ text:
|
|
16
|
-
{ text:
|
|
17
|
-
{ text:
|
|
18
|
-
{ text:
|
|
19
|
-
{ text:
|
|
20
|
-
{ text:
|
|
21
|
-
{ text:
|
|
22
|
-
{ text:
|
|
23
|
-
{ text:
|
|
24
|
-
{ text:
|
|
25
|
-
{ text:
|
|
26
|
-
{ text:
|
|
27
|
-
{ text:
|
|
28
|
-
{ text:
|
|
29
|
-
{ text:
|
|
30
|
-
{ text:
|
|
31
|
-
{ text:
|
|
32
|
-
{ text:
|
|
14
|
+
{ text: "物料编号", property: "itemNo" },
|
|
15
|
+
{ text: "物料名称", property: "itemName" },
|
|
16
|
+
{ text: "英文物料名称", property: "itemNameEng" },
|
|
17
|
+
{ text: "规格型号", property: "itemSpec" },
|
|
18
|
+
{ text: "英文规格型号", property: "itemSpecEng" },
|
|
19
|
+
{ text: "存货分类ID", property: "itemClassId" },
|
|
20
|
+
{ text: "物料种类ID", property: "itemCategoryId" },
|
|
21
|
+
{ text: "产品种类", property: "prodCategoryCode" },
|
|
22
|
+
{ text: "生产线id", property: "productLineId" },
|
|
23
|
+
{ text: "内销标志", property: "isDomesticSale" },
|
|
24
|
+
{ text: "外销标志", property: "isExportSale" },
|
|
25
|
+
{ text: "自制标志", property: "isSelfMade" },
|
|
26
|
+
{ text: "委外标志", property: "isSubcontract" },
|
|
27
|
+
{ text: "采购标志", property: "isPurchase" },
|
|
28
|
+
{ text: "基本单位编码", property: "baseUomCode" },
|
|
29
|
+
{ text: "辅助单位编码", property: "subUomCode" },
|
|
30
|
+
{ text: "基本单位换算值", property: "baseUomValue" },
|
|
31
|
+
{ text: "辅助单位换算值", property: "subUomValue" },
|
|
32
|
+
{ text: "是否管理批次", property: "isManageLot" },
|
|
33
|
+
// { text: "经营状况", property: "businessStatus" },
|
|
34
|
+
// { text: "客户等级", property: "customerGradeCode" },
|
|
35
|
+
// { text: "销售类型", property: "salesTypeCode" },
|
|
36
|
+
// { text: "纳税分类", property: "taxClassCode" },
|
|
37
|
+
// { text: "发票类型", property: "invoiceTypeCode" },
|
|
38
|
+
// { text: "税率类型", property: "taxrateTypeCode" },
|
|
39
|
+
|
|
33
40
|
];
|
|
34
41
|
// 查询条件
|
|
35
42
|
searchRules = [
|
|
36
|
-
{ text:
|
|
37
|
-
{ text:
|
|
43
|
+
{ text: "物料编号", op: "LI", property: "itemNo", displayType: "TextBox" },
|
|
44
|
+
{ text: "物料名称", op: "LI", property: "itemName", displayType: "TextBox",principal:true, },
|
|
38
45
|
];
|
|
39
46
|
//是否多选
|
|
40
47
|
isMultiple = true;
|
|
@@ -53,10 +60,10 @@ export default class CustomerList extends ListBasePage {
|
|
|
53
60
|
// 表单校验
|
|
54
61
|
editRules = {
|
|
55
62
|
itemNo: [
|
|
56
|
-
{ required: true, message:
|
|
63
|
+
{ required: true, message: "物料编号不能为空", trigger: "blur" }
|
|
57
64
|
],
|
|
58
65
|
itemName: [
|
|
59
|
-
{ required: true, message:
|
|
66
|
+
{ required: true, message: "物料名称不能为空", trigger: "blur" }
|
|
60
67
|
]
|
|
61
68
|
};
|
|
62
69
|
created() {
|
|
@@ -14,14 +14,14 @@
|
|
|
14
14
|
ref="entityForm"
|
|
15
15
|
:model="form"
|
|
16
16
|
:rules="resourceRules">
|
|
17
|
-
<el-form-item
|
|
17
|
+
<el-form-item label="资源" prop="resourceId">
|
|
18
18
|
<input-entity-lookup service-name="resource"
|
|
19
19
|
module-name="fd"
|
|
20
20
|
name-prop="resourceName"
|
|
21
21
|
no-prop="resourceNo"
|
|
22
22
|
:modal="ResourceModal"
|
|
23
23
|
:setting="{
|
|
24
|
-
title:
|
|
24
|
+
title: '选择资源',
|
|
25
25
|
width: '1200px',
|
|
26
26
|
multipleChoice: false
|
|
27
27
|
}"
|
|
@@ -33,7 +33,7 @@
|
|
|
33
33
|
@change="(val, data)=>{selectedResource = data}"
|
|
34
34
|
></input-entity-lookup>
|
|
35
35
|
</el-form-item>
|
|
36
|
-
<el-form-item
|
|
36
|
+
<el-form-item label="资源排序" prop="resourceSeq">
|
|
37
37
|
<!-- 只能输入整数 -->
|
|
38
38
|
<el-input-number
|
|
39
39
|
style="width: 100%"
|
|
@@ -61,9 +61,7 @@ export default {
|
|
|
61
61
|
},
|
|
62
62
|
title: {
|
|
63
63
|
type: String,
|
|
64
|
-
default:
|
|
65
|
-
return this.t('fd.addResource.title');
|
|
66
|
-
},
|
|
64
|
+
default: "添加资源",
|
|
67
65
|
},
|
|
68
66
|
},
|
|
69
67
|
data() {
|
|
@@ -74,10 +72,10 @@ export default {
|
|
|
74
72
|
selectedResource: null,
|
|
75
73
|
resourceRules: {
|
|
76
74
|
resourceId: [
|
|
77
|
-
{required: true, message:
|
|
75
|
+
{required: true, message: "请选择资源", trigger: "blur"},
|
|
78
76
|
],
|
|
79
77
|
resourceSeq: [
|
|
80
|
-
{required: true, message:
|
|
78
|
+
{required: true, message: "请输入资源排序", trigger: "blur"},
|
|
81
79
|
],
|
|
82
80
|
},
|
|
83
81
|
form: {
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
<base-dialog
|
|
3
3
|
:visible.sync="visible"
|
|
4
4
|
width="1200px"
|
|
5
|
-
|
|
5
|
+
title="设备选择"
|
|
6
6
|
append-to-body
|
|
7
7
|
@on-confirm="handleConfirm"
|
|
8
8
|
@on-cancel="cancel"
|
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
>
|
|
20
20
|
<el-row>
|
|
21
21
|
<el-col :span="6">
|
|
22
|
-
<el-form-item
|
|
22
|
+
<el-form-item label="产线" prop="lineId">
|
|
23
23
|
<el-select v-model="searchParams.lineId">
|
|
24
24
|
<el-option
|
|
25
25
|
v-for="item in lineList"
|
|
@@ -31,29 +31,29 @@
|
|
|
31
31
|
</el-form-item>
|
|
32
32
|
</el-col>
|
|
33
33
|
<el-col :span="6">
|
|
34
|
-
<el-form-item
|
|
34
|
+
<el-form-item label="设备编号" prop="assetCode">
|
|
35
35
|
<el-input
|
|
36
36
|
clearable
|
|
37
37
|
v-model="searchParams.assetCode"
|
|
38
|
-
|
|
38
|
+
placeholder="请输入设备编号"
|
|
39
39
|
></el-input>
|
|
40
40
|
</el-form-item>
|
|
41
41
|
</el-col>
|
|
42
42
|
<el-col :span="6">
|
|
43
|
-
<el-form-item
|
|
43
|
+
<el-form-item label="设备名称" prop="assetName">
|
|
44
44
|
<el-input
|
|
45
45
|
clearable
|
|
46
46
|
v-model="searchParams.assetName"
|
|
47
|
-
|
|
47
|
+
placeholder="请输入设备名称"
|
|
48
48
|
></el-input>
|
|
49
49
|
</el-form-item>
|
|
50
50
|
</el-col>
|
|
51
51
|
<el-col :span="6">
|
|
52
|
-
<el-form-item
|
|
52
|
+
<el-form-item label="设备型号" prop="factoryNumber">
|
|
53
53
|
<el-input
|
|
54
54
|
clearable
|
|
55
55
|
v-model="searchParams.assetModel"
|
|
56
|
-
|
|
56
|
+
placeholder="请输入设备型号"
|
|
57
57
|
></el-input>
|
|
58
58
|
</el-form-item>
|
|
59
59
|
</el-col>
|
|
@@ -65,14 +65,14 @@
|
|
|
65
65
|
icon="el-icon-search"
|
|
66
66
|
size="mini"
|
|
67
67
|
@click="handleQuery"
|
|
68
|
-
|
|
68
|
+
>搜索
|
|
69
69
|
</el-button
|
|
70
70
|
>
|
|
71
71
|
<el-button
|
|
72
72
|
icon="el-icon-refresh"
|
|
73
73
|
size="mini"
|
|
74
74
|
@click="resetQuery"
|
|
75
|
-
|
|
75
|
+
>重置
|
|
76
76
|
</el-button
|
|
77
77
|
>
|
|
78
78
|
</div>
|
|
@@ -97,7 +97,7 @@
|
|
|
97
97
|
<el-table-column type="selection" min-width="50" align="center" />
|
|
98
98
|
<el-table-column
|
|
99
99
|
type="index"
|
|
100
|
-
|
|
100
|
+
label="序号"
|
|
101
101
|
width="50"
|
|
102
102
|
align="center"
|
|
103
103
|
>
|
|
@@ -189,12 +189,12 @@ export default class assetModal extends Vue {
|
|
|
189
189
|
pageNum: 1,
|
|
190
190
|
};
|
|
191
191
|
listColumns = [
|
|
192
|
-
{text:
|
|
193
|
-
{text:
|
|
194
|
-
{text:
|
|
195
|
-
{text:
|
|
196
|
-
{text:
|
|
197
|
-
{text:
|
|
192
|
+
{text: "设备编号", property: "assetCode"},
|
|
193
|
+
{text: "设备名称", property: "assetName"},
|
|
194
|
+
{text: "出厂编号", property: "factoryNumber"},
|
|
195
|
+
{text: "设备型号", property: "assetModel"},
|
|
196
|
+
{text: "制造商", property: "assetMaker"},
|
|
197
|
+
{text: "供应商", property: "assetSupplier"}
|
|
198
198
|
];
|
|
199
199
|
|
|
200
200
|
clickRow(row) {
|