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
package/package.json
CHANGED
|
@@ -27,22 +27,22 @@ export default class AddressInfoModal extends ListBasePage {
|
|
|
27
27
|
// 列表列信息
|
|
28
28
|
listColumns = [
|
|
29
29
|
//{key: 0, label: "序号", visible: true},
|
|
30
|
-
{ text:
|
|
31
|
-
{ text:
|
|
32
|
-
{ text:
|
|
33
|
-
{ text:
|
|
30
|
+
{ text: "收件人", property: "addressee" },
|
|
31
|
+
{ text: "移动电话", property: "telNo" },
|
|
32
|
+
{ text: "邮编", property: "postalNo" },
|
|
33
|
+
{ text: "地址", property: "address" },
|
|
34
34
|
{
|
|
35
|
-
text:
|
|
35
|
+
text: "是否为收货地址", property: "isDefaultAddressee", setting: {
|
|
36
36
|
type: 'bool'
|
|
37
37
|
},
|
|
38
38
|
},
|
|
39
|
-
{ text:
|
|
39
|
+
{ text: "备注", property: "remark" },
|
|
40
40
|
];
|
|
41
41
|
|
|
42
42
|
// 查询条件
|
|
43
43
|
searchRules = [
|
|
44
|
-
{ text:
|
|
45
|
-
{ text:
|
|
44
|
+
{ text: "客户ID", property: "customerId", displayType: "TextBox", disabled: true, visible: false},
|
|
45
|
+
{ text: "收件人", property: "addressee" ,displayType: "TextBox",op: "LI",principal:true, },
|
|
46
46
|
];
|
|
47
47
|
// 列信息
|
|
48
48
|
editColumns = [
|
|
@@ -27,32 +27,32 @@ export default class BankInfoModal extends ListBasePage {
|
|
|
27
27
|
listColumns = [
|
|
28
28
|
//{key: 0, label: "序号", visible: true},
|
|
29
29
|
{
|
|
30
|
-
text:
|
|
30
|
+
text: "开户国家", property: "countryCode", setting: {
|
|
31
31
|
dictType: "country_code",
|
|
32
32
|
}
|
|
33
33
|
},
|
|
34
|
-
{ text:
|
|
35
|
-
{ text:
|
|
36
|
-
{ text:
|
|
37
|
-
{ text:
|
|
34
|
+
{ text: "开户银行", property: "bankName" },
|
|
35
|
+
{ text: "银行账户", property: "bankAccount" },
|
|
36
|
+
{ text: "账户名称", property: "accountName" },
|
|
37
|
+
{ text: "币种ID", property: "currencyId" },
|
|
38
38
|
{
|
|
39
|
-
text:
|
|
39
|
+
text: "是否默认账户", property: "isDefaultAccount", setting: {
|
|
40
40
|
type: "bool"
|
|
41
41
|
},
|
|
42
42
|
},
|
|
43
|
-
{ text:
|
|
43
|
+
{ text: "备注", property: "remark" },
|
|
44
44
|
];
|
|
45
45
|
|
|
46
46
|
// 查询条件
|
|
47
47
|
searchRules = [
|
|
48
|
-
{ text:
|
|
48
|
+
{ text: "客户ID", property: "customerId", displayType: "TextBox", disabled: true, visible: false},
|
|
49
49
|
{
|
|
50
|
-
text:
|
|
50
|
+
text: "开户国家", property: "countryCode", displayType: "DropDownList",
|
|
51
51
|
setting: {
|
|
52
52
|
dictType: "country_code",
|
|
53
53
|
}
|
|
54
54
|
},
|
|
55
|
-
{ text:
|
|
55
|
+
{ text: "开户银行", property: "bankName", displayType: "TextBox" },
|
|
56
56
|
];
|
|
57
57
|
opMenus = [];
|
|
58
58
|
|
|
@@ -30,32 +30,32 @@ export default class CustomercontactsList extends ListBasePage {
|
|
|
30
30
|
listColumns = [
|
|
31
31
|
//{key: 0, label: "序号", visible: true},
|
|
32
32
|
//{text: "客户ID", property: "customerId" },
|
|
33
|
-
{ text:
|
|
33
|
+
{ text: "姓名", property: "contactName" },
|
|
34
34
|
{
|
|
35
|
-
text:
|
|
35
|
+
text: "性别", property: "sexCode", setting: {
|
|
36
36
|
dictType: "sex_code",
|
|
37
37
|
}
|
|
38
38
|
},
|
|
39
|
-
{ text:
|
|
40
|
-
{ text:
|
|
41
|
-
{ text:
|
|
42
|
-
{ text:
|
|
43
|
-
{ text:
|
|
44
|
-
{ text:
|
|
39
|
+
{ text: "职务", property: "titleDesc" },
|
|
40
|
+
{ text: "移动电话", property: "mobilePhone" },
|
|
41
|
+
{ text: "固定电话", property: "fixedTelephone" },
|
|
42
|
+
{ text: "传真", property: "faxNo" },
|
|
43
|
+
{ text: "邮箱", property: "email" },
|
|
44
|
+
{ text: "地址", property: "address" },
|
|
45
45
|
{
|
|
46
|
-
text:
|
|
46
|
+
text: "是否为收货地址", property: "isShippingAddress",
|
|
47
47
|
setting: {
|
|
48
48
|
type: "bool"
|
|
49
49
|
},
|
|
50
50
|
},
|
|
51
|
-
{ text:
|
|
51
|
+
{ text: "备注", property: "remark" },
|
|
52
52
|
];
|
|
53
53
|
|
|
54
54
|
// 查询条件
|
|
55
55
|
searchRules = [
|
|
56
|
-
{ text:
|
|
57
|
-
{ text:
|
|
58
|
-
{ text:
|
|
56
|
+
{ text: "客户ID", property: "customerId", displayType: "TextBox", disabled: true, visible: false},
|
|
57
|
+
{ text: "姓名", property: "contactName",op: "LI",principal:true, },
|
|
58
|
+
{ text: "职务", property: "titleDesc", displayType: "TextBox" },
|
|
59
59
|
];
|
|
60
60
|
// 列信息
|
|
61
61
|
editColumns = [];
|
|
@@ -13,9 +13,46 @@ export default class CustomerList extends ListBasePage {
|
|
|
13
13
|
//表格是否自动加载数据
|
|
14
14
|
isAutoLoad = false;
|
|
15
15
|
// 列表列信息
|
|
16
|
-
listColumns = [
|
|
16
|
+
listColumns = [
|
|
17
|
+
//{key: 0, label: "序号", visible: true},
|
|
18
|
+
{ text: "客户编号", property: "customerNo", width: 100 },
|
|
19
|
+
{ text: "客户名称", property: "customerName", width: 260 },
|
|
20
|
+
{ text: "客户简称", property: "customerAbbr", width: 200 },
|
|
21
|
+
{ text: "国家", property: "countryCode" },
|
|
22
|
+
{ text: "地区", property: "areaCode" },
|
|
23
|
+
{ text: "省份", property: "provinceCode" },
|
|
24
|
+
{ text: "城市", property: "cityCode" },
|
|
25
|
+
{ text: "电话", property: "telNo", width: 120 },
|
|
26
|
+
{ text: "传真", property: "faxNo", width: 120 },
|
|
27
|
+
{ text: "邮编", property: "postalNo" },
|
|
28
|
+
{ text: "地址", property: "address", width: 220 },
|
|
29
|
+
{ text: "纳税登记号", property: "taxRegistrationNo", width: 160 },
|
|
30
|
+
{ text: "注册资本", property: "registeredCapital", width: 100 },
|
|
31
|
+
{ text: "公司类别", property: "companyCategoryCode" },
|
|
32
|
+
{ text: "公司性质", property: "companyNatureCode" },
|
|
33
|
+
{ text: "公司规模", property: "companySizeCode" },
|
|
34
|
+
{ text: "客户行业ID", property: "customerIndustryId" },
|
|
35
|
+
{ text: "客户区域ID", property: "customerAreaId" },
|
|
36
|
+
{ text: "经营状况", property: "businessStatus" },
|
|
37
|
+
{ text: "客户等级", property: "customerGradeCode" },
|
|
38
|
+
{ text: "销售类型", property: "salesTypeCode" },
|
|
39
|
+
{ text: "纳税分类", property: "taxClassCode" },
|
|
40
|
+
{ text: "发票类型", property: "invoiceTypeCode" },
|
|
41
|
+
{ text: "税率类型", property: "taxrateTypeCode" },
|
|
42
|
+
];
|
|
17
43
|
// 查询条件
|
|
18
|
-
searchRules = [
|
|
44
|
+
searchRules = [
|
|
45
|
+
{ text: "客户编号", op: "LI", property: "customerNo", displayType: "TextBox" },
|
|
46
|
+
{ text: "客户名称", op: "LI", property: "customerName", displayType: "TextBox",principal:true, },
|
|
47
|
+
{ text: "负责销售组织", op: "EQ", property: "salesSiteId", displayType: "DropDownList", disabled: false, setting: {
|
|
48
|
+
url: "/fd/fd/getUserSitesByParam",
|
|
49
|
+
//指定显示字段和取值字段
|
|
50
|
+
displayField: "componentName",
|
|
51
|
+
valueField: "id",
|
|
52
|
+
parameter: { isSales: 1 },
|
|
53
|
+
}
|
|
54
|
+
},
|
|
55
|
+
];
|
|
19
56
|
isMultiple = true;
|
|
20
57
|
listSetting = {
|
|
21
58
|
//获取列表数据的api方法名
|
|
@@ -27,57 +64,18 @@ export default class CustomerList extends ListBasePage {
|
|
|
27
64
|
isShowIndexColumn: true, // 显示行号
|
|
28
65
|
multipleChoice: false,
|
|
29
66
|
};
|
|
30
|
-
opMenus = [
|
|
67
|
+
opMenus = [
|
|
68
|
+
];
|
|
31
69
|
// 表单校验
|
|
32
|
-
editRules = {
|
|
70
|
+
editRules = {
|
|
71
|
+
customerNo: [
|
|
72
|
+
{ required: true, message: "客户编号不能为空", trigger: "blur" }
|
|
73
|
+
],
|
|
74
|
+
customerName: [
|
|
75
|
+
{ required: true, message: "客户名称不能为空", trigger: "blur" }
|
|
76
|
+
]
|
|
77
|
+
};
|
|
33
78
|
created(){
|
|
34
|
-
this.listColumns = [
|
|
35
|
-
//{key: 0, label: "序号", visible: true},
|
|
36
|
-
{ text: this.t('customerModal.customerNo'), property: "customerNo", width: 100 },
|
|
37
|
-
{ text: this.t('customerModal.customerName'), property: "customerName", width: 260 },
|
|
38
|
-
{ text: this.t('customerModal.customerAbbr'), property: "customerAbbr", width: 200 },
|
|
39
|
-
{ text: this.t('customerModal.countryCode'), property: "countryCode" },
|
|
40
|
-
{ text: this.t('customerModal.areaCode'), property: "areaCode" },
|
|
41
|
-
{ text: this.t('customerModal.provinceCode'), property: "provinceCode" },
|
|
42
|
-
{ text: this.t('customerModal.cityCode'), property: "cityCode" },
|
|
43
|
-
{ text: this.t('customerModal.telNo'), property: "telNo", width: 120 },
|
|
44
|
-
{ text: this.t('customerModal.faxNo'), property: "faxNo", width: 120 },
|
|
45
|
-
{ text: this.t('customerModal.postalNo'), property: "postalNo" },
|
|
46
|
-
{ text: this.t('customerModal.address'), property: "address", width: 220 },
|
|
47
|
-
{ text: this.t('customerModal.taxRegistrationNo'), property: "taxRegistrationNo", width: 160 },
|
|
48
|
-
{ text: this.t('customerModal.registeredCapital'), property: "registeredCapital", width: 100 },
|
|
49
|
-
{ text: this.t('customerModal.companyCategoryCode'), property: "companyCategoryCode" },
|
|
50
|
-
{ text: this.t('customerModal.companyNatureCode'), property: "companyNatureCode" },
|
|
51
|
-
{ text: this.t('customerModal.companySizeCode'), property: "companySizeCode" },
|
|
52
|
-
{ text: this.t('customerModal.customerIndustryId'), property: "customerIndustryId" },
|
|
53
|
-
{ text: this.t('customerModal.customerAreaId'), property: "customerAreaId" },
|
|
54
|
-
{ text: this.t('customerModal.businessStatus'), property: "businessStatus" },
|
|
55
|
-
{ text: this.t('customerModal.customerGradeCode'), property: "customerGradeCode" },
|
|
56
|
-
{ text: this.t('customerModal.salesTypeCode'), property: "salesTypeCode" },
|
|
57
|
-
{ text: this.t('customerModal.taxClassCode'), property: "taxClassCode" },
|
|
58
|
-
{ text: this.t('customerModal.invoiceTypeCode'), property: "invoiceTypeCode" },
|
|
59
|
-
{ text: this.t('customerModal.taxrateTypeCode'), property: "taxrateTypeCode" },
|
|
60
|
-
];
|
|
61
|
-
this.searchRules = [
|
|
62
|
-
{ text: this.t('customerModal.customerNo'), op: "LI", property: "customerNo", displayType: "TextBox" },
|
|
63
|
-
{ text: this.t('customerModal.customerName'), op: "LI", property: "customerName", displayType: "TextBox",principal:true, },
|
|
64
|
-
{ text: this.t('customerModal.salesSiteId'), op: "EQ", property: "salesSiteId", displayType: "DropDownList", disabled: false, setting: {
|
|
65
|
-
url: "/fd/fd/getUserSitesByParam",
|
|
66
|
-
//指定显示字段和取值字段
|
|
67
|
-
displayField: "componentName",
|
|
68
|
-
valueField: "id",
|
|
69
|
-
parameter: { isSales: 1 },
|
|
70
|
-
}
|
|
71
|
-
},
|
|
72
|
-
];
|
|
73
|
-
this.editRules = {
|
|
74
|
-
customerNo: [
|
|
75
|
-
{ required: true, message: this.t('customerModal.required.customerNo'), trigger: "blur" }
|
|
76
|
-
],
|
|
77
|
-
customerName: [
|
|
78
|
-
{ required: true, message: this.t('customerModal.required.customerName'), trigger: "blur" }
|
|
79
|
-
]
|
|
80
|
-
};
|
|
81
79
|
if(this.setting?.data?.isMultipleStatus!=undefined){
|
|
82
80
|
this.isMultiple = this.setting.data.isMultipleStatus
|
|
83
81
|
}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
<div class="app-container">
|
|
3
3
|
<div class="wrapper-container" v-show="showSearch">
|
|
4
4
|
<el-form :model="queryParams" ref="queryForm" :inline="true">
|
|
5
|
-
<el-form-item
|
|
5
|
+
<el-form-item label="业务组织" prop="siteId" required>
|
|
6
6
|
<entity-select
|
|
7
7
|
v-model="queryParams.siteId"
|
|
8
8
|
clearable
|
|
@@ -16,20 +16,20 @@
|
|
|
16
16
|
></entity-select>
|
|
17
17
|
</el-form-item>
|
|
18
18
|
|
|
19
|
-
<el-form-item
|
|
19
|
+
<el-form-item label="部门编码" prop="deptCode">
|
|
20
20
|
<el-input
|
|
21
21
|
v-model="queryParams.deptCode"
|
|
22
|
-
|
|
22
|
+
placeholder="请输入部门编码"
|
|
23
23
|
clearable
|
|
24
24
|
size="small"
|
|
25
25
|
@keyup.native="filterData"
|
|
26
26
|
@clear="filterData"
|
|
27
27
|
/>
|
|
28
28
|
</el-form-item>
|
|
29
|
-
<el-form-item
|
|
29
|
+
<el-form-item label="部门名称" prop="deptName">
|
|
30
30
|
<el-input
|
|
31
31
|
v-model="queryParams.deptName"
|
|
32
|
-
|
|
32
|
+
placeholder="请输入部门名称"
|
|
33
33
|
clearable
|
|
34
34
|
size="small"
|
|
35
35
|
@keyup.native="filterData"
|
|
@@ -50,13 +50,13 @@
|
|
|
50
50
|
@current-change="handleCurrentChange"
|
|
51
51
|
:tree-props="{children: 'children', hasChildren: 'hasChildren'}">
|
|
52
52
|
<el-table-column type="index" width="50" />
|
|
53
|
-
<el-table-column prop="label"
|
|
54
|
-
<el-table-column prop="code"
|
|
53
|
+
<el-table-column prop="label" label="部门名称" min-width="120"/>
|
|
54
|
+
<el-table-column prop="code" label="部门编码" min-width="120"/>
|
|
55
55
|
</el-table>
|
|
56
56
|
<div class="table-container-supplement"/>
|
|
57
57
|
<div slot="footer" class="dialog-footer">
|
|
58
|
-
<el-button type="primary" :loading="submitLoading" @click="submitForm"
|
|
59
|
-
<el-button @click="cancel"
|
|
58
|
+
<el-button type="primary" :loading="submitLoading" @click="submitForm">确 定</el-button>
|
|
59
|
+
<el-button @click="cancel">取 消</el-button>
|
|
60
60
|
</div>
|
|
61
61
|
</div>
|
|
62
62
|
</div>
|
|
@@ -118,7 +118,7 @@ export default class DeptModal extends Vue {
|
|
|
118
118
|
let deptId = site.relatedDeptId;
|
|
119
119
|
this.relatedSiteId = siteId
|
|
120
120
|
if(!deptId){
|
|
121
|
-
this.msgError(
|
|
121
|
+
this.msgError("业务组织未关联部门");
|
|
122
122
|
this.loading = false;
|
|
123
123
|
return;
|
|
124
124
|
}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
<base-dialog
|
|
3
3
|
:visible.sync="visible"
|
|
4
4
|
width="960px"
|
|
5
|
-
|
|
5
|
+
title="人员选择"
|
|
6
6
|
append-to-body
|
|
7
7
|
@on-confirm="handleConfirm"
|
|
8
8
|
@on-cancel="handleCancel"
|
|
@@ -18,8 +18,8 @@
|
|
|
18
18
|
>
|
|
19
19
|
<el-row class="mb8">
|
|
20
20
|
<el-col :span="8">
|
|
21
|
-
<el-form-item
|
|
22
|
-
<el-select v-model="listQueryParams.siteId"
|
|
21
|
+
<el-form-item label="业务组织" prop="siteId">
|
|
22
|
+
<el-select v-model="listQueryParams.siteId" placeholder="请选择" @change="siteChangeEvent" :disabled="siteDisabled">
|
|
23
23
|
<el-option
|
|
24
24
|
v-for="item in siteOptions"
|
|
25
25
|
:key="item.id"
|
|
@@ -31,7 +31,7 @@
|
|
|
31
31
|
</el-form-item>
|
|
32
32
|
</el-col>
|
|
33
33
|
<el-col :span="8">
|
|
34
|
-
<el-form-item
|
|
34
|
+
<el-form-item label="部门名称" prop="deptId">
|
|
35
35
|
<el-cascader
|
|
36
36
|
v-model="listQueryParams.deptId"
|
|
37
37
|
:options="deptOptions"
|
|
@@ -45,8 +45,8 @@
|
|
|
45
45
|
</el-form-item>
|
|
46
46
|
</el-col>
|
|
47
47
|
<el-col :span="8">
|
|
48
|
-
<el-form-item
|
|
49
|
-
<el-select v-model="listQueryParams.postId"
|
|
48
|
+
<el-form-item label="岗位名称" prop="postId">
|
|
49
|
+
<el-select v-model="listQueryParams.postId" placeholder="请选择" clearable>
|
|
50
50
|
<el-option
|
|
51
51
|
v-for="item in postOptions"
|
|
52
52
|
:key="item.postId"
|
|
@@ -60,12 +60,12 @@
|
|
|
60
60
|
</el-row>
|
|
61
61
|
<el-row class="mb8">
|
|
62
62
|
<el-col :span="8">
|
|
63
|
-
<el-form-item
|
|
63
|
+
<el-form-item label="员工编号" prop="employeeNo">
|
|
64
64
|
<el-input v-model="listQueryParams.employeeNo" clearable/>
|
|
65
65
|
</el-form-item>
|
|
66
66
|
</el-col>
|
|
67
67
|
<el-col :span="8">
|
|
68
|
-
<el-form-item
|
|
68
|
+
<el-form-item label="员工名称" prop="employeeName">
|
|
69
69
|
<el-input v-model="listQueryParams.employeeName" clearable/>
|
|
70
70
|
</el-form-item>
|
|
71
71
|
</el-col>
|
|
@@ -76,13 +76,13 @@
|
|
|
76
76
|
icon="el-icon-search"
|
|
77
77
|
size="mini"
|
|
78
78
|
@click="handleQuery"
|
|
79
|
-
|
|
79
|
+
>查询
|
|
80
80
|
</el-button>
|
|
81
81
|
<el-button
|
|
82
82
|
icon="el-icon-refresh"
|
|
83
83
|
size="mini"
|
|
84
84
|
@click="resetQuery"
|
|
85
|
-
|
|
85
|
+
>重置
|
|
86
86
|
</el-button>
|
|
87
87
|
</el-form-item>
|
|
88
88
|
</el-col>
|
|
@@ -103,10 +103,10 @@
|
|
|
103
103
|
@selection-change="onSelectionChange"
|
|
104
104
|
>
|
|
105
105
|
<el-table-column type="selection" min-width="50" align="center" />
|
|
106
|
-
<el-table-column prop="employeeNo"
|
|
107
|
-
<el-table-column prop="employeeName"
|
|
108
|
-
<el-table-column prop="deptName"
|
|
109
|
-
<el-table-column prop="postName"
|
|
106
|
+
<el-table-column prop="employeeNo" label="员工编号" min-width="100" align="left" show-overflow-tooltip />
|
|
107
|
+
<el-table-column prop="employeeName" label="员工名称" min-width="100" align="left" show-overflow-tooltip />
|
|
108
|
+
<el-table-column prop="deptName" label="部门名称" min-width="100" align="left" show-overflow-tooltip/>
|
|
109
|
+
<el-table-column prop="postName" label="岗位名称" min-width="100" align="left" show-overflow-tooltip/>
|
|
110
110
|
</el-table>
|
|
111
111
|
<pagination
|
|
112
112
|
:total="listQueryParams.total"
|
|
@@ -184,7 +184,11 @@ export default {
|
|
|
184
184
|
deptOptionIds: [],
|
|
185
185
|
siteOptions: [],
|
|
186
186
|
postOptions: [],
|
|
187
|
-
rules: {
|
|
187
|
+
rules: {
|
|
188
|
+
siteId: [
|
|
189
|
+
{ required: true, message: '请选择业务组织', trigger: 'blur' }
|
|
190
|
+
]
|
|
191
|
+
},
|
|
188
192
|
relatedDeptId: undefined
|
|
189
193
|
}
|
|
190
194
|
},
|
|
@@ -192,17 +196,9 @@ export default {
|
|
|
192
196
|
watch: {},
|
|
193
197
|
mounted() {},
|
|
194
198
|
created() {
|
|
195
|
-
this.initRules()
|
|
196
199
|
this.init()
|
|
197
200
|
},
|
|
198
201
|
methods: {
|
|
199
|
-
initRules() {
|
|
200
|
-
this.rules = {
|
|
201
|
-
siteId: [
|
|
202
|
-
{ required: true, message: this.t('common.pleaseSelectSite'), trigger: 'blur' }
|
|
203
|
-
]
|
|
204
|
-
}
|
|
205
|
-
},
|
|
206
202
|
async init() {
|
|
207
203
|
if (this.siteId) {
|
|
208
204
|
this.$set(this.listQueryParams, "siteId", this.siteId)
|
|
@@ -265,7 +261,7 @@ export default {
|
|
|
265
261
|
},
|
|
266
262
|
getList() {
|
|
267
263
|
if (!this.relatedDeptId) {
|
|
268
|
-
this.msgError(
|
|
264
|
+
this.msgError("该业务组织未关联部门,请先设置关联部门。");
|
|
269
265
|
return
|
|
270
266
|
}
|
|
271
267
|
this.loading = true
|
|
@@ -299,7 +295,7 @@ export default {
|
|
|
299
295
|
},
|
|
300
296
|
handleConfirm() {
|
|
301
297
|
if (!this.multipleSelection || this.multipleSelection.length === 0) {
|
|
302
|
-
this.msgError(
|
|
298
|
+
this.msgError("请选择一笔员工数据!");
|
|
303
299
|
} else {
|
|
304
300
|
if(this.multipleChoice) {
|
|
305
301
|
this.confirm(this.multipleSelection)
|
|
@@ -319,7 +315,7 @@ export default {
|
|
|
319
315
|
if(!selectOption) return;
|
|
320
316
|
this.relatedDeptId = selectOption.relatedDeptId;
|
|
321
317
|
if(!this.relatedDeptId){
|
|
322
|
-
this.msgError(
|
|
318
|
+
this.msgError("该业务组织未关联部门,请先设置关联部门。");
|
|
323
319
|
return;
|
|
324
320
|
}
|
|
325
321
|
this.getDept(this.relatedDeptId);
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
<template>
|
|
2
|
-
<base-dialog :visible.sync="visible" width="1200px"
|
|
2
|
+
<base-dialog :visible.sync="visible" width="1200px" title="物料选择" append-to-body @on-confirm="handleConfirm"
|
|
3
3
|
@on-cancel="cancel">
|
|
4
4
|
<div class="app-container">
|
|
5
5
|
<el-container class="item-panel default-background">
|
|
@@ -16,22 +16,22 @@
|
|
|
16
16
|
<el-form ref="queryForm" :model="searchParams" label-width="120px" size="small">
|
|
17
17
|
<el-row>
|
|
18
18
|
<el-col :span="6" v-if="!isSkipSearch('itemNo')">
|
|
19
|
-
<el-form-item
|
|
20
|
-
<el-input clearable v-model="searchParams.item.itemNo"
|
|
19
|
+
<el-form-item label="物料编号" prop="itemNo">
|
|
20
|
+
<el-input clearable v-model="searchParams.item.itemNo" placeholder="请输入物料编号"></el-input>
|
|
21
21
|
</el-form-item>
|
|
22
22
|
</el-col>
|
|
23
23
|
<el-col :span="6" v-if="!isSkipSearch('itemName')">
|
|
24
|
-
<el-form-item
|
|
25
|
-
<el-input clearable v-model="searchParams.item.itemName"
|
|
24
|
+
<el-form-item label="物料名称" prop="itemName">
|
|
25
|
+
<el-input clearable v-model="searchParams.item.itemName" placeholder="请输入物料名称"></el-input>
|
|
26
26
|
</el-form-item>
|
|
27
27
|
</el-col>
|
|
28
28
|
<el-col :span="6" v-if="!isSkipSearch('itemSpec')">
|
|
29
|
-
<el-form-item
|
|
30
|
-
<el-input clearable v-model="searchParams.item.itemSpec"
|
|
29
|
+
<el-form-item label="规格型号" prop="itemSpec">
|
|
30
|
+
<el-input clearable v-model="searchParams.item.itemSpec" placeholder="请输入规格型号"></el-input>
|
|
31
31
|
</el-form-item>
|
|
32
32
|
</el-col>
|
|
33
33
|
<el-col :span="6" v-if="!isSkipSearch('itemClassId') && !showItemClass">
|
|
34
|
-
<el-form-item
|
|
34
|
+
<el-form-item label="存货分类" prop="itemSpec">
|
|
35
35
|
<el-cascader
|
|
36
36
|
:options="treeData"
|
|
37
37
|
@change="onItemClassIdChange"
|
|
@@ -44,12 +44,12 @@
|
|
|
44
44
|
</el-row>
|
|
45
45
|
<el-row>
|
|
46
46
|
<el-col :span="6">
|
|
47
|
-
<el-form-item
|
|
47
|
+
<el-form-item label="物料种类" prop="itemCategoryId">
|
|
48
48
|
<entity-select v-model="searchParams.item.itemCategoryId" module-name="bd"
|
|
49
49
|
service-name="itemCategory" :filterable="true" disp-prop="itemCategoryName"
|
|
50
50
|
:label-formatter="(itemCategory)=>{return itemCategory.itemCategoryNo + '-' + itemCategory.itemCategoryName}"
|
|
51
51
|
order-by-column="item_category_no" @change="handleItemCategorySelect"
|
|
52
|
-
clearable :placeholder="
|
|
52
|
+
clearable :placeholder="'请选择物料种类'">
|
|
53
53
|
</entity-select>
|
|
54
54
|
</el-form-item>
|
|
55
55
|
</el-col>
|
|
@@ -74,11 +74,9 @@
|
|
|
74
74
|
<el-row :gutter="20">
|
|
75
75
|
</el-row>
|
|
76
76
|
<div style="float: right; margin-top: 6px">
|
|
77
|
-
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"
|
|
78
|
-
{{ t('component.table.search') }}
|
|
77
|
+
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索
|
|
79
78
|
</el-button>
|
|
80
|
-
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
|
|
81
|
-
{{ t('component.table.reset') }}
|
|
79
|
+
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置
|
|
82
80
|
</el-button>
|
|
83
81
|
</div>
|
|
84
82
|
</el-form>
|
|
@@ -99,7 +97,7 @@
|
|
|
99
97
|
:header-cell-style="{ 'text-align': 'center' }">
|
|
100
98
|
<el-table-column type="selection" width="55" align="center">
|
|
101
99
|
</el-table-column>
|
|
102
|
-
<el-table-column type="index"
|
|
100
|
+
<el-table-column type="index" label="序号" width="50" align="center">
|
|
103
101
|
<template scope="scope">
|
|
104
102
|
<span>{{
|
|
105
103
|
(searchParams.pageNum - 1) * searchParams.pageSize +
|
|
@@ -127,8 +125,8 @@
|
|
|
127
125
|
</el-col>
|
|
128
126
|
<el-col :span="6" style="height: 100%">
|
|
129
127
|
<el-table height="100%" :border="true" :data="currentEntity.attributes">
|
|
130
|
-
<el-table-column
|
|
131
|
-
<el-table-column
|
|
128
|
+
<el-table-column label="属性名称" prop="attributeName"></el-table-column>
|
|
129
|
+
<el-table-column label="属性值" prop="attributeValue"></el-table-column>
|
|
132
130
|
</el-table>
|
|
133
131
|
</el-col>
|
|
134
132
|
</el-row>
|
|
@@ -205,7 +203,11 @@ export default class itemModal extends Vue {
|
|
|
205
203
|
pageSize: 10,
|
|
206
204
|
pageNum: 1,
|
|
207
205
|
};
|
|
208
|
-
listColumns = [
|
|
206
|
+
listColumns = [
|
|
207
|
+
{text: "物料编号", property: "itemNo", width: 120},
|
|
208
|
+
{text: "物料名称", property: "itemName"},
|
|
209
|
+
{text: "规格型号", property: "itemSpec"},
|
|
210
|
+
];
|
|
209
211
|
|
|
210
212
|
@Watch("searchParams.item", {deep: true})
|
|
211
213
|
onSearchParamsItemChange(newValue, oldVale) {
|
|
@@ -404,11 +406,6 @@ export default class itemModal extends Vue {
|
|
|
404
406
|
}
|
|
405
407
|
|
|
406
408
|
created() {
|
|
407
|
-
this.listColumns = [
|
|
408
|
-
{text: (this as any).t('itemModal.itemNo'), property: "itemNo", width: 120},
|
|
409
|
-
{text: (this as any).t('itemModal.itemName'), property: "itemName"},
|
|
410
|
-
{text: (this as any).t('itemModal.itemSpec'), property: "itemSpec"},
|
|
411
|
-
];
|
|
412
409
|
this.getTreeData();
|
|
413
410
|
this.getList();
|
|
414
411
|
console.log(this.value);
|
|
@@ -33,23 +33,23 @@ export default class ItemList extends ListBasePage {
|
|
|
33
33
|
// 列表列信息
|
|
34
34
|
listColumns = [
|
|
35
35
|
//{key: 0, label: "序号", visible: true},
|
|
36
|
-
{ text:
|
|
37
|
-
{ text:
|
|
38
|
-
{ text:
|
|
39
|
-
{ text:
|
|
40
|
-
{ text:
|
|
36
|
+
{ text: "物料编号", property: "itemNo" },
|
|
37
|
+
{ text: "物料名称", property: "itemName" },
|
|
38
|
+
{ text: "规格型号", property: "itemSpec" },
|
|
39
|
+
{ text: "物料状态", property: "itemStatusCode" },
|
|
40
|
+
{ text: "基本单位", property: "baseUomCode" },
|
|
41
41
|
];
|
|
42
42
|
// 查询条件
|
|
43
43
|
searchRules = [
|
|
44
|
-
{ text:
|
|
44
|
+
{ text: "物料编号", property: "itemNo", displayType: "TextBox", op: "LI" },
|
|
45
45
|
{
|
|
46
|
-
text:
|
|
46
|
+
text: "物料名称",
|
|
47
47
|
property: "itemName",
|
|
48
48
|
displayType: "TextBox",
|
|
49
49
|
op: "LI",
|
|
50
50
|
},
|
|
51
51
|
{
|
|
52
|
-
text:
|
|
52
|
+
text: "规格型号",
|
|
53
53
|
property: "itemSpec",
|
|
54
54
|
displayType: "TextBox",
|
|
55
55
|
op: "LI",
|
|
@@ -11,20 +11,20 @@ export default class NumberingRuleModal extends ListBasePage {
|
|
|
11
11
|
labelwidth = "100px";
|
|
12
12
|
// 列表列信息
|
|
13
13
|
listColumns = [
|
|
14
|
-
{text:
|
|
15
|
-
{text:
|
|
14
|
+
{text: "编码规则编号", property: "numberingRuleNo"},
|
|
15
|
+
{text: "编码规则名称", property: "numberingRuleName"},
|
|
16
16
|
];
|
|
17
17
|
//是否展示勾选框
|
|
18
18
|
isMultiple = true;
|
|
19
19
|
// 查询条件
|
|
20
20
|
searchRules = [
|
|
21
|
-
{text:
|
|
22
|
-
{text:
|
|
21
|
+
{text: "编码规则编号", op: "LI", property: "numberingRuleNo", displayType: "TextBox", width:9},
|
|
22
|
+
{text: "编码规则名称", op: "LI", property: "numberingRuleName", displayType: "TextBox", width:9},
|
|
23
23
|
];
|
|
24
24
|
// 列信息
|
|
25
25
|
editColumns = [
|
|
26
|
-
{text:
|
|
27
|
-
{text:
|
|
26
|
+
{text: "编码规则编号", property: "numberingRuleNo", displayType: "TextBox"},
|
|
27
|
+
{text: "编码规则名称", property: "numberingRuleName", displayType: "TextBox"},
|
|
28
28
|
];
|
|
29
29
|
opMenus = [
|
|
30
30
|
];
|
|
@@ -52,10 +52,10 @@ export default class NumberingRuleModal extends ListBasePage {
|
|
|
52
52
|
// 表单校验
|
|
53
53
|
editRules = {
|
|
54
54
|
vendorNo: [
|
|
55
|
-
{required: true, message:
|
|
55
|
+
{required: true, message: "编码规则编号不能为空", trigger: "blur"}
|
|
56
56
|
],
|
|
57
57
|
vendorName: [
|
|
58
|
-
{required: true, message:
|
|
58
|
+
{required: true, message: "编码规则名称不能为空", trigger: "blur"}
|
|
59
59
|
],
|
|
60
60
|
};
|
|
61
61
|
mounted() {
|