✨ 新增业务部门配置页并简化项目/合同部门选择
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
+61
-123
@@ -303,7 +303,7 @@ export default {
|
||||
headerAlign: 'left',
|
||||
order: 80,
|
||||
search: true,
|
||||
searchOrder: 2,
|
||||
searchOrder: 3,
|
||||
rules: [
|
||||
{
|
||||
required: true,
|
||||
@@ -366,105 +366,13 @@ export default {
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
label: '金蝶部门代码',
|
||||
prop: 'kingdeeDeptCode',
|
||||
minWidth: 140,
|
||||
order: 65,
|
||||
maxlength: 64,
|
||||
showWordLimit: true,
|
||||
rules: [
|
||||
{
|
||||
validator: (rule, value, callback) => {
|
||||
const code = String(value || '').trim();
|
||||
if (!code) {
|
||||
callback();
|
||||
return;
|
||||
}
|
||||
if (code.length > 64) {
|
||||
callback(new Error('金蝶部门代码不能超过64个字符'));
|
||||
return;
|
||||
}
|
||||
callback();
|
||||
},
|
||||
trigger: 'blur',
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
label: '合同编码前缀',
|
||||
prop: 'contractCodePrefix',
|
||||
minWidth: 160,
|
||||
order: 62,
|
||||
maxlength: 64,
|
||||
showWordLimit: true,
|
||||
placeholder: '如 GWZH成都',
|
||||
tip: '合同编号规则：前缀（年份）三位流水号，流水按本部门独立编号',
|
||||
rules: [
|
||||
{
|
||||
validator: (rule, value, callback) => {
|
||||
const prefix = String(value || '').trim();
|
||||
if (!prefix) {
|
||||
callback();
|
||||
return;
|
||||
}
|
||||
if (prefix.length > 64) {
|
||||
callback(new Error('合同编码前缀不能超过64个字符'));
|
||||
return;
|
||||
}
|
||||
callback();
|
||||
},
|
||||
trigger: 'blur',
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
label: '合同初始流水号',
|
||||
prop: 'contractInitialSerial',
|
||||
type: 'input',
|
||||
minWidth: 140,
|
||||
order: 61,
|
||||
placeholder: '如 1',
|
||||
// -1 为空占位，列表展示为空
|
||||
formatter: row =>
|
||||
Number(row.contractInitialSerial) === -1 ? '' : row.contractInitialSerial,
|
||||
tip: '该部门当年首个合同时从此流水号起编，后续递增；范围1-999，不填默认从1开始',
|
||||
rules: [
|
||||
{
|
||||
validator: (rule, value, callback) => {
|
||||
// -1 为空占位，不填时按空处理
|
||||
if (
|
||||
value === undefined ||
|
||||
value === null ||
|
||||
value === '' ||
|
||||
Number(value) === -1
|
||||
) {
|
||||
callback();
|
||||
return;
|
||||
}
|
||||
const text = String(value).trim();
|
||||
if (!/^\d+$/.test(text)) {
|
||||
callback(new Error('合同初始流水号只能输入正整数'));
|
||||
return;
|
||||
}
|
||||
const serial = Number(text);
|
||||
if (serial < 1 || serial > 999) {
|
||||
callback(new Error('合同初始流水号范围为1到999'));
|
||||
return;
|
||||
}
|
||||
callback();
|
||||
},
|
||||
trigger: 'blur',
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
label: '组织简称',
|
||||
prop: 'shortName',
|
||||
minWidth: 140,
|
||||
order: 60,
|
||||
search: true,
|
||||
searchOrder: 1,
|
||||
searchOrder: 4,
|
||||
},
|
||||
{
|
||||
label: '助记码',
|
||||
@@ -525,8 +433,12 @@ export default {
|
||||
dataType: 'number',
|
||||
value: 0,
|
||||
width: 120,
|
||||
order: 35,
|
||||
order: 36,
|
||||
search: true,
|
||||
searchOrder: 2,
|
||||
searchPlaceholder: '请选择是否平台公司',
|
||||
formatter: row => (Number(row.isPlatformCompany) === 1 ? '是' : '否'),
|
||||
change: ({ value }) => this.handlePlatformCompanyChange(value),
|
||||
rules: [
|
||||
{
|
||||
required: true,
|
||||
@@ -535,6 +447,37 @@ export default {
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
label: '金蝶部门代码',
|
||||
prop: 'kingdeeDeptCode',
|
||||
minWidth: 140,
|
||||
order: 35,
|
||||
maxlength: 64,
|
||||
showWordLimit: true,
|
||||
// 仅平台公司维护/展示金蝶组织代码；非平台公司列表留空
|
||||
addDisplay: false,
|
||||
editDisplay: false,
|
||||
viewDisplay: false,
|
||||
formatter: row =>
|
||||
Number(row.isPlatformCompany) === 1 ? String(row.kingdeeDeptCode || '').trim() : '',
|
||||
rules: [
|
||||
{
|
||||
validator: (rule, value, callback) => {
|
||||
const code = String(value || '').trim();
|
||||
if (!code) {
|
||||
callback();
|
||||
return;
|
||||
}
|
||||
if (code.length > 64) {
|
||||
callback(new Error('金蝶部门代码不能超过64个字符'));
|
||||
return;
|
||||
}
|
||||
callback();
|
||||
},
|
||||
trigger: 'blur',
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
label: '是否业务部门',
|
||||
prop: 'isBusinessDept',
|
||||
@@ -547,6 +490,9 @@ export default {
|
||||
value: 0,
|
||||
width: 120,
|
||||
order: 34,
|
||||
search: true,
|
||||
searchOrder: 1,
|
||||
searchPlaceholder: '请选择是否业务部门',
|
||||
formatter: row => (Number(row.isBusinessDept) === 1 ? '是' : '否'),
|
||||
rules: [
|
||||
{
|
||||
@@ -1217,28 +1163,20 @@ export default {
|
||||
row.parentId = 0;
|
||||
}
|
||||
},
|
||||
normalizeContractInitialSerial(value) {
|
||||
// -1 为空占位，不填时不落库、不回显
|
||||
if (
|
||||
value === undefined ||
|
||||
value === null ||
|
||||
value === '' ||
|
||||
Number(value) === -1
|
||||
) {
|
||||
return null;
|
||||
handlePlatformCompanyChange(value) {
|
||||
const isPlatform = Number(value) === 1;
|
||||
this.syncKingdeeDeptCodeDisplay(isPlatform);
|
||||
if (!isPlatform && this.form) {
|
||||
this.form.kingdeeDeptCode = '';
|
||||
}
|
||||
const text = String(value).trim();
|
||||
if (!text) {
|
||||
return null;
|
||||
}
|
||||
const serial = Number(text);
|
||||
return Number.isInteger(serial) ? serial : value;
|
||||
},
|
||||
clearEmptyContractInitialSerial(form = this.form) {
|
||||
if (!form) return;
|
||||
if (Number(form.contractInitialSerial) === -1) {
|
||||
form.contractInitialSerial = '';
|
||||
}
|
||||
syncKingdeeDeptCodeDisplay(isPlatformCompany) {
|
||||
const column = this.findColumn(this.option.column, 'kingdeeDeptCode');
|
||||
if (!column) return;
|
||||
const visible = Number(isPlatformCompany) === 1;
|
||||
column.addDisplay = visible;
|
||||
column.editDisplay = visible;
|
||||
column.viewDisplay = visible;
|
||||
},
|
||||
isRootDept(row) {
|
||||
return row && (row.parentId === 0 || String(row.parentId) === '0');
|
||||
@@ -1384,9 +1322,9 @@ export default {
|
||||
rowSave(row, done, loading) {
|
||||
row.tenantId = row.tenantId || this.userInfo.tenantId || website.tenantId;
|
||||
row.deptCode = String(row.deptCode || '').trim();
|
||||
row.kingdeeDeptCode = String(row.kingdeeDeptCode || '').trim();
|
||||
row.contractCodePrefix = String(row.contractCodePrefix || '').trim();
|
||||
row.contractInitialSerial = this.normalizeContractInitialSerial(row.contractInitialSerial);
|
||||
// 合同前缀/流水已迁至业务部门配置；组织管理仅维护平台公司金蝶代码
|
||||
row.kingdeeDeptCode =
|
||||
Number(row.isPlatformCompany) === 1 ? String(row.kingdeeDeptCode || '').trim() : '';
|
||||
row.leaderId = func.join(row.leaderId);
|
||||
this.normalizeTopParent(row);
|
||||
if (!this.prepareDeptSubmitRow(row)) {
|
||||
@@ -1432,9 +1370,9 @@ export default {
|
||||
rowUpdate(row, index, done, loading) {
|
||||
row.tenantId = row.tenantId || this.userInfo.tenantId || website.tenantId;
|
||||
row.deptCode = String(row.deptCode || '').trim();
|
||||
row.kingdeeDeptCode = String(row.kingdeeDeptCode || '').trim();
|
||||
row.contractCodePrefix = String(row.contractCodePrefix || '').trim();
|
||||
row.contractInitialSerial = this.normalizeContractInitialSerial(row.contractInitialSerial);
|
||||
// 合同前缀/流水已迁至业务部门配置；组织管理仅维护平台公司金蝶代码
|
||||
row.kingdeeDeptCode =
|
||||
Number(row.isPlatformCompany) === 1 ? String(row.kingdeeDeptCode || '').trim() : '';
|
||||
row.leaderId = func.join(row.leaderId);
|
||||
this.normalizeTopParent(row);
|
||||
if (!this.prepareDeptSubmitRow(row)) {
|
||||
@@ -1547,7 +1485,7 @@ export default {
|
||||
if (this.form.isBusinessDept === undefined || this.form.isBusinessDept === null) {
|
||||
this.form.isBusinessDept = 0;
|
||||
}
|
||||
this.clearEmptyContractInitialSerial(this.form);
|
||||
this.syncKingdeeDeptCodeDisplay(this.form.isPlatformCompany);
|
||||
this.initData(this.form.tenantId);
|
||||
this.loadParentDeptCode(this.form.parentId);
|
||||
}
|
||||
@@ -1562,7 +1500,7 @@ export default {
|
||||
if (this.form.parentId === '0') {
|
||||
this.form.parentId = '';
|
||||
}
|
||||
this.clearEmptyContractInitialSerial(this.form);
|
||||
this.syncKingdeeDeptCodeDisplay(this.form.isPlatformCompany);
|
||||
this.loadParentDeptCode(this.form.parentId);
|
||||
if (this.form.hasOwnProperty('leaderId')) {
|
||||
const splitResult = func.split(this.form.leaderId);
|
||||
|
||||
Reference in New Issue
Block a user