Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

Browse Source
This commit is contained in:
Taric Xin
2022-03-07 16:20:45 +08:00
parent 28837d56a6 1481a0ffd4
commit ef1f8e98e7
4 changed files with 52 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts
View File

@ -176,42 +176,23 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
}
}
},
dispatchPhone: {
type: 'string',
title: '手机号',
maxLength: 30,
ui: {
hidden: true,
placeholder: '请输入'
}
},
dispatchName: {
type: 'string',
title: '名字',
title: '调度员姓名',
maxLength: 30,
ui: {
hidden: true,
optionalHelp: '选若未填写，司机直接联系您',
placeholder: '请输入'
}
},
dispatchId: {
dispatchPhone: {
type: 'string',
title: '调度员',
title: '调度员手机号',
maxLength: 30,
ui: {
widget: 'select',
placeholder: '请选择',
allowClear: true,
change: (value: any, data: any) => {
if (data.label) {
const dat = data.label.split('/');
this.sf1.setValue('/dispatchName', dat[0]);
this.sf1.setValue('/dispatchPhone', dat[1]);
}
},
optionalHelp: '选择调度员，司机直接联系调度员 ; 不选择，司机直接联系您',
asyncData: () => this.shipperSrv.getStaffList2()
} as SFSelectWidgetSchema
}
placeholder: '请输入'
}
},
},
required: ['shipperAppUserId', 'enterpriseProjectId', 'enterpriseInfoName', 'deadlineTime']
};
@ -911,7 +892,6 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
enterpriseProjectId: res?.enterpriseProjectId || '',
enterpriseInfoName: res?.enterpriseInfoName || '',
externalResourceCode: res?.externalResourceCode || '',
dispatchId: res?.dispatchId || '',
deadlineTime: res?.deadlineTime || ''
};
if (this.PageStatus === '大宗修改') {

35
src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts
View File

@ -199,42 +199,23 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit {
},
}
},
dispatchPhone: {
type: 'string',
title: '手机号',
maxLength: 11,
ui: {
hidden: true,
placeholder: '请输入'
}
},
dispatchName: {
type: 'string',
title: '名字',
title: '调度员姓名',
maxLength: 30,
ui: {
hidden: true,
optionalHelp: '选若未填写，司机直接联系您',
placeholder: '请输入'
}
},
dispatchId: {
dispatchPhone: {
type: 'string',
title: '调度员',
title: '调度员手机号',
maxLength: 30,
ui: {
widget: 'select',
placeholder: '请选择',
allowClear: true,
change: (value: any, data: any) => {
if(data.label) {
const dat = data.label.split('/')
this.sf1.setValue('/dispatchName', dat[0]);
this.sf1.setValue('/dispatchPhone', dat[1]);
}
},
optionalHelp: '选择调度员，司机直接联系调度员 ; 不选择，司机直接联系您',
asyncData: () => this.shipperSrv.getStaffList2()
} as SFSelectWidgetSchema
}
placeholder: '请输入'
}
},
},
required: ['shipperAppUserId', 'enterpriseProjectId','enterpriseInfoName','enterpriseInfoId', 'deadlineTime',]
};

55
src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts
View File

@ -197,42 +197,41 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
placeholder: '请输入'
}
},
dispatchPhone: {
type: 'string',
title: '手机号',
maxLength: 30,
ui: {
hidden: true,
placeholder: '请输入'
}
},
dispatchName: {
type: 'string',
title: '名字',
title: '调度员姓名',
maxLength: 30,
ui: {
hidden: true,
optionalHelp: '选若未填写，司机直接联系您',
placeholder: '请输入'
}
},
dispatchId: {
dispatchPhone: {
type: 'string',
title: '调度员',
title: '调度员手机号',
maxLength: 30,
ui: {
widget: 'select',
placeholder: '请选择',
allowClear: true,
optionalHelp: '选择调度员，司机直接联系调度员 ; 不选择，司机直接联系您',
change: (_value: any, data: any) => {
if (data.label) {
const dat = data.label.split('/');
this.sf1.setValue('/dispatchName', dat[0]);
this.sf1.setValue('/dispatchPhone', dat[1]);
}
},
asyncData: () => this.shipperSrv.getStaffList2()
} as SFSelectWidgetSchema
placeholder: '请输入'
}
},
// dispatchId: {
// type: 'string',
// title: '调度员',
// ui: {
// widget: 'select',
// placeholder: '请选择',
// allowClear: true,
// optionalHelp: '选择调度员，司机直接联系调度员 ; 不选择，司机直接联系您',
// change: (_value: any, data: any) => {
// if (data.label) {
// const dat = data.label.split('/');
// this.sf1.setValue('/dispatchName', dat[0]);
// this.sf1.setValue('/dispatchPhone', dat[1]);
// }
// },
// asyncData: () => this.shipperSrv.getStaffList2()
// } as SFSelectWidgetSchema
// },
},
required: ['shipperAppUserId', 'enterpriseProjectId']
};
@ -250,9 +249,6 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
$enterpriseProjectId: {
grid: { span: 12 }
},
$dispatchId: {
grid: { span: 12 }
}
};
}
initSF3() {
@ -1136,7 +1132,6 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
dispatchPhone: res?.dispatchPhone,
dispatchName: res?.dispatchName,
externalResourceCode: res?.externalResourceCode,
dispatchId: res?.dispatchId
};
if (this.PageStatus === '整车修改') {
this.sf1data.id = res?.id;

33
src/app/routes/supply-management/components/release-publish/release-publish.component.ts
View File

@ -195,41 +195,22 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
placeholder: '请输入'
}
},
dispatchPhone: {
type: 'string',
title: '手机号',
maxLength: 30,
ui: {
hidden: true,
placeholder: '请输入'
}
},
dispatchName: {
type: 'string',
title: '名字',
title: '调度员姓名',
maxLength: 30,
ui: {
hidden: true,
optionalHelp: '选若未填写，司机直接联系您',
placeholder: '请输入'
}
},
dispatchId: {
dispatchPhone: {
type: 'string',
title: '调度员',
title: '调度员手机号',
maxLength: 30,
ui: {
widget: 'select',
placeholder: '请选择',
allowClear: true,
change: (_value: any, data: any) => {
if (data.label) {
const dat = data.label.split('/');
this.sf1.setValue('/dispatchName', dat[0]);
this.sf1.setValue('/dispatchPhone', dat[1]);
}
},
optionalHelp: '选择调度员，司机直接联系调度员 ; 不选择，司机直接联系您',
asyncData: () => this.shipperSrv.getStaffList2()
} as SFSelectWidgetSchema
placeholder: '请输入'
}
},
},
required: ['shipperAppUserId', 'enterpriseProjectId', 'enterpriseInfoName']