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-05-07 15:12:55 +08:00
parent ccf64a754a 77d5992ef5
commit 1521042889
7 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
proxy.conf.js
View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2022-01-18 09:51:21 * @Date : 2022-01-18 09:51:21
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-05-07 14:00:05 * @LastEditTime : 2022-05-07 14:49:15
* @FilePath : \\tms-obc-web\\proxy.conf.js * @FilePath : \\tms-obc-web\\proxy.conf.js
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
*/ */

8
src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts
View File

@ -5,7 +5,7 @@ import { OnChanges } from '@angular/core';
* @Author : Shiming * @Author : Shiming
* @Date : 2022-01-05 11:01:55 * @Date : 2022-01-05 11:01:55
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-04-27 20:19:39 * @LastEditTime : 2022-05-07 14:28:16
* @FilePath : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\contract-template-detail\\contract-template-detail.component.ts * @FilePath : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\contract-template-detail\\contract-template-detail.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
*/ */
@ -94,7 +94,8 @@ export class ContractManagementTemplateTextComponent implements OnInit {
{ label: '订单补充协议', value: '2' }, { label: '订单补充协议', value: '2' },
{ label: '运单合同', value: '3' }, { label: '运单合同', value: '3' },
{ label: '运单补充协议', value: '4' }, { label: '运单补充协议', value: '4' },
{ label: '委托代收合同', value: '5' } { label: '委托代收合同', value: '5' },
{ label: '权力义务转让协议', value: '10' },
]; ];
this.sf.getProperty('/contractType')!.schema.enum = this.Types; this.sf.getProperty('/contractType')!.schema.enum = this.Types;
this.sf.getProperty('/contractType')!.widget.reset(this.Types); this.sf.getProperty('/contractType')!.widget.reset(this.Types);
@ -217,7 +218,8 @@ export class ContractManagementTemplateTextComponent implements OnInit {
{ label: '订单补充协议', value: '2' }, { label: '订单补充协议', value: '2' },
{ label: '运单合同', value: '3' }, { label: '运单合同', value: '3' },
{ label: '运单补充协议', value: '4' }, { label: '运单补充协议', value: '4' },
{ label: '委托代收合同', value: '5' } { label: '委托代收合同', value: '5' },
{ label: '权力义务转让协议', value: '10' },
]; ];
setTimeout(() => { setTimeout(() => {
if (this.sf) { if (this.sf) {

2
src/app/routes/contract-management/components/contract-template/contract-template.component.ts
View File

@ -245,7 +245,7 @@ export class ContractManagementTemplateDetailComponent implements OnInit {
this.service.request(this.service.$api_deletebatch_contractTemplate, [value.id]).subscribe(res => { this.service.request(this.service.$api_deletebatch_contractTemplate, [value.id]).subscribe(res => {
if (res) { if (res) {
this.service.msgSrv.success('删除成功！'); this.service.msgSrv.success('删除成功！');
this.st.reload(1) this.st.reload()
} }
}) })
}); });

1
src/app/routes/partner/level-config/components/list/list.component.ts
View File

@ -195,6 +195,5 @@ export class ParterLevelConfigListComponent implements OnInit {
*/ */
resetSF() { resetSF() {
this.sf.reset(); this.sf.reset();
this.st.load(1);
} }
} }

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

@ -223,7 +223,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
}, },
goodsTypeId: { goodsTypeId: {
type: 'string', type: 'string',
title: '货物名称', title: '货物类型',
ui: { ui: {
widget: 'select', widget: 'select',
placeholder: '请选择', placeholder: '请选择',
@ -255,7 +255,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
ui: { ui: {
widget: 'select', widget: 'select',
placeholder: '请选择', placeholder: '请选择',
errors: { required: '请填写货物名称' }, errors: { required: '请填写货物类型' },
change: (value: any, data: any) => { change: (value: any, data: any) => {
this.sf3.setValue('/goodsName', data.label); this.sf3.setValue('/goodsName', data.label);
}, },
@ -279,7 +279,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
title: '', title: '',
maxLength: 20, maxLength: 20,
ui: { ui: {
errors: { required: '请填写货物名称' }, errors: { required: '请填写货物类型' },
visibleIf: { visibleIf: {
goodsTypeName: (value: any) => value && value === '其它' goodsTypeName: (value: any) => value && value === '其它'
}, },
@ -1162,7 +1162,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
this.service.request(this.service.$api_checkGoodsName, name).subscribe(res => { this.service.request(this.service.$api_checkGoodsName, name).subscribe(res => {
if (res === false) { if (res === false) {
const modalRef = this.modalService.error({ const modalRef = this.modalService.error({
nzTitle: '货物名称含有违禁词，请重新输入！', nzTitle: '货物类型含有违禁词，请重新输入！',
}); });
modalRef.afterClose.subscribe(result => { modalRef.afterClose.subscribe(result => {
// this.sf3.setValue('/goodsName1', null); // this.sf3.setValue('/goodsName1', null);

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

@ -269,7 +269,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
}, },
goodsTypeId: { goodsTypeId: {
type: 'string', type: 'string',
title: '货物名称', title: '货物类型',
ui: { ui: {
widget: 'select', widget: 'select',
placeholder: '请选择', placeholder: '请选择',
@ -301,7 +301,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
ui: { ui: {
widget: 'select', widget: 'select',
placeholder: '请选择', placeholder: '请选择',
errors: { required: '请填写货物名称' }, errors: { required: '请填写货物类型' },
change: (_value: any, data: any) => { change: (_value: any, data: any) => {
this.sf3.setValue('/goodsName', data.label); this.sf3.setValue('/goodsName', data.label);
}, },
@ -325,7 +325,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
title: '', title: '',
maxLength: 20, maxLength: 20,
ui: { ui: {
errors: { required: '请填写货物名称' }, errors: { required: '请填写货物类型' },
visibleIf: { visibleIf: {
goodsTypeName: (value: any) => value && value === '其它' goodsTypeName: (value: any) => value && value === '其它'
}, },
@ -1510,7 +1510,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
this.service.request(this.service.$api_checkGoodsName, name).subscribe(res => { this.service.request(this.service.$api_checkGoodsName, name).subscribe(res => {
if (res === false) { if (res === false) {
const modalRef = this.modalService.error({ const modalRef = this.modalService.error({
nzTitle: '货物名称含有违禁词，请重新输入！', nzTitle: '货物类型含有违禁词，请重新输入！',
}); });
modalRef.afterClose.subscribe(result => { modalRef.afterClose.subscribe(result => {
// this.sf3.setValue('/goodsName1', null); // this.sf3.setValue('/goodsName1', null);

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

@ -259,11 +259,11 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
}, },
goodsTypeId: { goodsTypeId: {
type: 'string', type: 'string',
title: '货物名称', title: '货物类型',
ui: { ui: {
widget: 'select', widget: 'select',
placeholder: '请选择', placeholder: '请选择',
errors: { required: '请选择货物名称' }, errors: { required: '请选择货物类型' },
asyncData: () => asyncData: () =>
this.shipperSrv.loadConfigByKey('goods.name.config.type').pipe( this.shipperSrv.loadConfigByKey('goods.name.config.type').pipe(
map((data: any) => { map((data: any) => {
@ -291,7 +291,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
ui: { ui: {
widget: 'select', widget: 'select',
placeholder: '请选择', placeholder: '请选择',
errors: { required: '请填写货物名称' }, errors: { required: '请填写货物类型' },
change: (value: any, data: any) => { change: (value: any, data: any) => {
this.sf3.setValue('/goodsName', data.label); this.sf3.setValue('/goodsName', data.label);
}, },
@ -315,7 +315,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
title: '', title: '',
maxLength: 20, maxLength: 20,
ui: { ui: {
errors: { required: '请填写货物名称' }, errors: { required: '请填写货物类型' },
visibleIf: { visibleIf: {
goodsTypeName: (value: any) => value && value === '其它' goodsTypeName: (value: any) => value && value === '其它'
}, },
@ -1294,7 +1294,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
this.service.request(this.service.$api_checkGoodsName, name).subscribe(res => { this.service.request(this.service.$api_checkGoodsName, name).subscribe(res => {
if (res === false) { if (res === false) {
const modalRef = this.modalService.error({ const modalRef = this.modalService.error({
nzTitle: '货物名称含有违禁词，请重新输入！', nzTitle: '货物类型含有违禁词，请重新输入！',
}); });
modalRef.afterClose.subscribe(result => { modalRef.afterClose.subscribe(result => {
// this.sf3.setValue('/goodsName1', null); // this.sf3.setValue('/goodsName1', null);