From 250ba40253891cc36565f9aeeac01acac1143f39 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Sat, 7 May 2022 10:39:09 +0800 Subject: [PATCH 01/14] fix bug --- .../components/freight/list/list.component.html | 4 ++-- .../components/freight/list/list.component.ts | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/app/routes/usercenter/components/freight/list/list.component.html b/src/app/routes/usercenter/components/freight/list/list.component.html index 018efd10..d54aba9f 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.html +++ b/src/app/routes/usercenter/components/freight/list/list.component.html @@ -38,12 +38,12 @@
  • 新增企业
    • - + diff --git a/src/app/routes/usercenter/components/freight/list/list.component.ts b/src/app/routes/usercenter/components/freight/list/list.component.ts index 2d8995c3..d415d0bd 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.ts +++ b/src/app/routes/usercenter/components/freight/list/list.component.ts @@ -468,14 +468,14 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen text: '分配客服人员', click: item => this.showService(item) }, - // { - // text: '修改合伙人', - // click: item => this.editPartner(item) - // }, - // { - // text: '修改渠道销售', - // click: item => this.editSale(item) - // } + { + text: '修改合伙人', + click: item => this.editPartner(item) + }, + { + text: '修改渠道销售', + click: item => this.editSale(item) + } ] } ]; From 9cb9dc80218667e3f8190062b94b414b2ef3ce1f Mon Sep 17 00:00:00 2001 From: weiyu Date: Sat, 7 May 2022 11:07:43 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E4=BC=98=E5=8C=96UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bulk-publish/bulk-publish.component.html | 342 ++++++------ .../bulk-publish/bulk-publish.component.less | 101 +++- .../bulk-publish/bulk-publish.component.ts | 34 +- .../onecar-publish.component.html | 487 +++++++++--------- .../onecar-publish.component.less | 102 +++- .../onecar-publish.component.ts | 69 ++- .../release-publish.component.html | 468 ++++++++--------- .../release-publish.component.less | 103 +++- .../release-publish.component.ts | 67 ++- .../billing-order.component.html | 8 - .../billing-order/billing-order.component.ts | 2 +- src/assets/images/frame.png | Bin 0 -> 710 bytes 12 files changed, 1071 insertions(+), 712 deletions(-) create mode 100644 src/assets/images/frame.png diff --git a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html index fc4ad284..8e7b3d7c 100644 --- a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html +++ b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html @@ -5,179 +5,187 @@ - -
    货源单设置
    - -     +
    + +
    货源单设置
    + +     - -
    装卸货信息预计公里数：{{ totalDistance }}km，预计行程耗时：{{ totalTime }}小时
    - -
    -
    -
    -
    - - 装货地 - -
    - - - -
    -     -     - - 联系人 -
    - - - - - - -
    -     -
    -
    -
    -
    - -
    -
    -
    -
    - - 卸货地 - -
    - - - -
    -     -     - - 联系人 -
    - - - - - - -
    -     -
    -
    + +
    装卸货信息预计公里数：{{ totalDistance }}km，预计行程耗时：{{ totalTime }}小时
    - - -     - -
    货物信息
    -
    -
    - - - - - - 国家法规及行政命令禁限运货物不能托运 - 《禁运物品说明》 - - - - - - - - - - - - - +
    +
    +
    +
    + + 装货地 + +
    + + + +
    +     +     + + 联系人 +
    +
    + + + + + + +
    +
    +     +
    +
    +
    +
    + +
    +
    +
    +
    + + 卸货地 + +
    + + + +
    +     +     + + 联系人 +
    +
    + + + + + + +
    +
    +     +
    +
    +
    + +
    + + + +
    货物信息
    +
    +
    + + + - - -
    - - - - - - - -

    例如 付司机运费 = 重量*单价 = 999.99

    -

    保留小数，即 999.99

    -

    抹除小数，即 999.00

    -

    抹除个位，即 990.00

    + + 国家法规及行政命令禁限运货物不能托运 + 《禁运物品说明》 + + + + + + + + + + + + + -
    -     - - - - - - - - - - - - - - - -     -
    -
    -     - - -
    补充信息
    -
    -
    - - -
    + +
    -
    - -
    -
    -  天内支付运费 + + + + + + + +

    例如 付司机运费 = 重量*单价 = 999.99

    +

    保留小数，即 999.99

    +

    抹除小数，即 999.00

    +

    抹除个位，即 990.00

    +     +
    + + + + + + + + + + + + + + + + + +
    +
    + + + +
    补充信息
    +
    +
    + + +
    +
    +
    + +
    +
    +  天内支付运费 +
    -
    - - + + +
    -
    -     - -
    - - - - -
    -     + + +
    + + + + +
    +     +
    \ No newline at end of file diff --git a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.less b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.less index a2ab5fbc..45705916 100644 --- a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.less +++ b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.less @@ -11,10 +11,10 @@ .sf3 { .goods_Tips_item { .goods_tips { - width: calc(50% - 45px); + width: calc(50% - 57px); .ant-alert { - padding: 0 0 0 2px; + margin-bottom: 5px; } } @@ -79,3 +79,100 @@ input[type='number']::-webkit-outer-spin-button { margin: 0; -webkit-appearance: none; } + +.custom-style { + ::ng-deep { + .ant-card { + margin-bottom: 0; + } + + .ant-card-body { + padding-bottom: 0; + } + + .ant-card-bordered { + border: 0 none; + } + + .card-title { + display: flex; + align-items: center; + + >span { + margin-left: 8px; + font-size: 14px; + + em { + font-style: normal; + color: #E60012; + } + } + + &::before { + content: ''; + display: inline-block; + width: 2px; + height: 16px; + margin-right: 10px; + background: #E60012; + } + } + + .ant-btn-dangerous { + border-radius: 4px; + color: #CF3834; + border-color: rgba(207, 56, 52, 0.5); + } + + .icon-wrap { + display: flex; + justify-content: center; + height: 100%; + } + + .swap-icon { + background: url('/assets/images/frame.png') no-repeat 50% 50%; + cursor: pointer; + } + + .ant-input-affix-wrapper, + .ant-input, + .ant-picker, + .ant-select-selector, + .ant-input-number-input, + .ant-input-number { + border-radius: 4px ; + } + .ant-input-group-addon { + border-radius: 0 4px 4px 0; + } + .align-center { + .ant-btn { + height: 40px; + padding: 0 23px; + font-size: 16px; + border-radius: 3px; + } + } + .ant-select-arrow { + transform: scaleX(1.5) translateY(2px); + color: rgb(153,153,153); + font-size: 8px; + } + .ant-picker-suffix { + color: #333; + } + .btn-wrap { + margin-top: 20px; + padding-bottom: 20px; + } + .ant-alert { + padding: 6px 16px; + border-radius: 2px; + font-size: 14px; + } + .fc { + color: #f5222d; + } + } +} diff --git a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts index 733bddf3..2a4d764b 100644 --- a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts +++ b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts @@ -203,7 +203,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit { this.ui1 = { '*': { spanLabelFixed: 115, - grid: { span: 12 } + grid: { span: 8 } } }; } @@ -293,9 +293,12 @@ export class SupplyManagementBulkPublishComponent implements OnInit { }; this.ui3 = { '*': { - spanLabelFixed: 90, + spanLabelFixed: 115, grid: { span: 12 } }, + $goodsNameId: { + spanLabelFixed: 10 + }, $goodsTips: { grid: { span: 24 } } @@ -406,33 +409,37 @@ export class SupplyManagementBulkPublishComponent implements OnInit { }; this.ui4 = { '*': { - spanLabelFixed: 90, - grid: { span: 24 } + spanLabelFixed: 115, + grid: { span: 12 } }, $freightPrice: { grid: { span: 8 } }, $rule: { + spanLabelFixed: 10, grid: { span: 8 } }, $settlementBasis: { + spanLabelFixed: 10, grid: { span: 8 } }, $weight: { - grid: { lg: 8, md: 12, sm: 12, xs: 24 } + grid: { span: 4 } }, $volume: { - grid: { lg: 8, md: 12, sm: 12, xs: 24 } + spanLabelFixed: 10, + grid: { span: 4 } }, $number: { - grid: { lg: 8, md: 12, sm: 12, xs: 24 } + spanLabelFixed: 10, + grid: { span: 4 } }, $carModel: { - spanLabelFixed: 120, - grid: { span: 8 } + grid: { span: 6 } }, $carLength: { - grid: { span: 8 } + spanLabelFixed: 10, + grid: { span: 6 } } }; } @@ -522,7 +529,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit { ui: { widget: 'textarea', placeholder: '请输入', - autosize: { minRows: 3, maxRows: 3 } + autosize: { minRows: 1, maxRows: 1 } } as SFTextareaWidgetSchema } }, @@ -538,7 +545,10 @@ export class SupplyManagementBulkPublishComponent implements OnInit { }; this.ui7 = { '*': { - spanLabelFixed: 90, + spanLabelFixed: 115, + grid: { span: 8 } + }, + $remarks: { grid: { span: 24 } } }; diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html index 73a34d9a..41bf1dcf 100644 --- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html +++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html @@ -5,264 +5,271 @@ - -
    货源单设置
    - -     +
    + +
    货源单设置
    + +     - -
    装卸货信息预计公里数：{{ totalDistance }}km，预计行程耗时：{{ totalTime }}小时
    + +
    装卸货信息预计公里数：{{ totalDistance }}km，预计行程耗时：{{ totalTime }}小时 +
    -
    -
    -
    -
    - - 装货地 - -
    - - - - - + +
    +
    +
    + + 装货地 + +
    + + + + + +
    +     +     + + 联系人 +
    +
    + + + + + + +
    +     +
    +
    +
    +
    + +
    +
    +
    +
    +
    + +
    +
    +
    +
    + + 卸货地 + +
    + + + + + +
    +     +     + + 联系人 +
    +
    + + + + + + +
    +
    +     +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    + + 装货时间 + + +
    +
    +
    - 联系人 -
    - - - - - - -
    -     -
    -
    -
    -
    - -
    -
    -
    -
    -
    - -
    -
    -
    -
    - - 卸货地 - -
    - - - - - -
    + 卸货时间 + +     - - 联系人 -
    - - - - - - -
    -     -
    -
    -
    -
    - -
    -
    -
    -
    - - 装货时间 - - - - -
    -
    -
    - - 卸货时间 - - - - + + + + + +
    货物信息
    +
    +
    + + + + + + 国家法规及行政命令禁限运货物不能托运 + 《禁运物品说明》 + + +
    - - -     + + + + + + + + + + + + + + + + + +
    + + +
    +     +     + - -
    货物信息
    -
    -
    - - - - - - 国家法规及行政命令禁限运货物不能托运 - 《禁运物品说明》 - - - -
    -
    - - - - - - - - - - - - - - - - - -
    - - + +
    服务信息
    +
    +
    + + +  货源曝光率 +10   +  车源匹配率 +10 + + +  货源曝光率 +20   +  车源匹配率 +20 + + + + + + + + ①香港、澳门、台湾、西藏、新疆不予承保，②单次运输保额仅限200万元以内，③保险详细内容及注意事项请见《保险告知函》 +
    - - - - - -
    服务信息
    -
    -
    - - -  货源曝光率 +10   -  车源匹配率 +10 - - -  货源曝光率 +20   -  车源匹配率 +20 - - - - - - - - ①香港、澳门、台湾、西藏、新疆不予承保，②单次运输保额仅限200万元以内，③保险详细内容及注意事项请见《保险告知函》 -
    -
    -     + - -
    补充信息
    -
    -
    - + +
    补充信息
    +
    +
    + +
    -
    - + - -
    运费信息
    -
    -
    - - - - - - - - - - - - - - {{ i.value | currency }} - {{ i.value | currency }}（费率：{{ currentRate | number: - '0.2-4' }}%） - {{ i.value | currency }} - -
    -
    - + +
    运费信息
    +
    +
    + + + + + + + + + + + + + + {{ i.value | currency }} + {{ i.value | currency }}（费率：{{ currentRate | number: + '0.2-4' }}%） + {{ i.value | currency }} + +
    +
    + +
    +
    +  天内支付运费 +
    -
    -  天内支付运费 -
    -
    - - + + +
    -
    - - -
    - - - - -
    -     + + +
    + + + + +
    +     +
    \ No newline at end of file diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.less b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.less index a445eacf..5376d908 100644 --- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.less +++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.less @@ -5,16 +5,16 @@ } nz-date-picker { - width: 94.3%; + width: 100%; } .sf3 { .goods_Tips_item { .goods_tips { - width: calc(50% - 45px); + width: calc(50% - 57px); .ant-alert { - padding: 0 0 0 2px; + margin-bottom: 5px; } } @@ -84,3 +84,99 @@ input[type='number']::-webkit-outer-spin-button { margin-left: 10px; color: aqua; } +.custom-style { + ::ng-deep { + .ant-card { + margin-bottom: 0; + } + + .ant-card-body { + padding-bottom: 0; + } + + .ant-card-bordered { + border: 0 none; + } + + .card-title { + display: flex; + align-items: center; + + >span { + margin-left: 8px; + font-size: 14px; + + em { + font-style: normal; + color: #E60012; + } + } + + &::before { + content: ''; + display: inline-block; + width: 2px; + height: 16px; + margin-right: 10px; + background: #E60012; + } + } + + .ant-btn-dangerous { + border-radius: 4px; + color: #CF3834; + border-color: rgba(207, 56, 52, 0.5); + } + + .icon-wrap { + display: flex; + justify-content: center; + height: 100%; + } + + .swap-icon { + background: url('/assets/images/frame.png') no-repeat 50% 50%; + cursor: pointer; + } + + .ant-input-affix-wrapper, + .ant-input, + .ant-picker, + .ant-select-selector, + .ant-input-number-input, + .ant-input-number { + border-radius: 4px ; + } + .ant-input-group-addon { + border-radius: 0 4px 4px 0; + } + .align-center { + .ant-btn { + height: 40px; + padding: 0 23px; + font-size: 16px; + border-radius: 3px; + } + } + .ant-select-arrow { + transform: scaleX(1.5) translateY(2px); + color: rgb(153,153,153); + font-size: 8px; + } + .ant-picker-suffix { + color: #333; + } + .btn-wrap { + margin-top: 20px; + padding-bottom: 20px; + } + .ant-alert { + padding: 6px 16px; + border-radius: 2px; + font-size: 14px; + } + .fc { + color: #f5222d; + } + } +} \ No newline at end of file diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts index b99d9d75..4d823afa 100644 --- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts +++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts @@ -246,16 +246,10 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { this.ui1 = { '*': { spanLabelFixed: 115, - grid: { span: 12 } + grid: { span: 8 } }, $enterpriseInfoName: { - grid: { span: 12 } - }, - $shipperAppUserId: { - grid: { span: 12 } - }, - $enterpriseProjectId: { - grid: { span: 12 } + grid: { span: 8 } } }; } @@ -345,9 +339,12 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { }; this.ui3 = { '*': { - spanLabelFixed: 90, + spanLabelFixed: 115, grid: { span: 12 } }, + $goodsNameId: { + spanLabelFixed: 10 + }, $goodsTips: { grid: { span: 24 } } @@ -416,14 +413,14 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { } } }, - hidenField: { - type: 'string', - title: '', - default: ' ', - ui: { - widget: 'text' - } - }, + // hidenField: { + // type: 'string', + // title: '', + // default: ' ', + // ui: { + // widget: 'text' + // } + // }, insurancePackagedGoods: { type: 'string', title: '货物包装', @@ -460,7 +457,25 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { this.ui4 = { '*': { spanLabelFixed: 115, - grid: { span: 8 } + grid: { span: 12 } + }, + $weight: { + grid: { span: 4 } + }, + $volume: { + spanLabelFixed: 10, + grid: { span: 4 } + }, + $number: { + spanLabelFixed: 10, + grid: { span: 4 } + }, + $carModel: { + grid: { span: 6 } + }, + $carLength: { + spanLabelFixed: 10, + grid: { span: 6 } } }; } @@ -545,16 +560,16 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { this.ui5 = { '*': { spanLabelFixed: 115, - grid: { span: 12 } + grid: { span: 8 } }, $type1: { - grid: { span: 24 } + grid: { span: 8 } }, $type2: { - grid: { span: 24 } + grid: { span: 8 } }, $freeInsurance1: { - grid: { span: 24 } + grid: { span: 24} }, $freeInsurance2: { grid: { span: 24 } @@ -656,7 +671,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { ui: { widget: 'textarea', placeholder: '请输入', - autosize: { minRows: 3, maxRows: 3 } + autosize: { minRows: 1, maxRows: 1 } } as SFTextareaWidgetSchema } }, @@ -664,7 +679,10 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { }; this.ui6 = { '*': { - spanLabelFixed: 90, + spanLabelFixed: 125, + grid: { span: 8 } + }, + $remarks: { grid: { span: 24 } } }; @@ -705,6 +723,9 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { this.ui7 = { '*': { spanLabelFixed: 115, + grid: { span: 8 } + }, + $paymentDays: { grid: { span: 24 } } }; diff --git a/src/app/routes/supply-management/components/release-publish/release-publish.component.html b/src/app/routes/supply-management/components/release-publish/release-publish.component.html index efdb686f..f1c553d4 100644 --- a/src/app/routes/supply-management/components/release-publish/release-publish.component.html +++ b/src/app/routes/supply-management/components/release-publish/release-publish.component.html @@ -5,261 +5,265 @@ - -
    货源单设置
    - - {{ i.value }} - -     +
    + +
    货源单设置
    + + {{ i.value }} + +     - -
    装卸货信息预计公里数：{{ totalDistance }}km，预计行程耗时：{{ totalTime }}小时
    + +
    装卸货信息预计公里数：{{ totalDistance }}km，预计行程耗时：{{ totalTime + }}小时 +
    -
    -
    -
    -
    - - 装货地 - -
    - - - - - + +
    +
    +
    + + 装货地 + +
    + + + + + +
    +     +     + + 联系人 +
    +
    + + + + + + +
    - -     - - 联系人 -
    - - - - - - -
    -     -
    -
    -
    -
    -
    +
    +
    +
    -
    -
    -
    - +
    +
    + +
    -
    -
    -
    - - 卸货地 - -
    - - - - - +
    +
    + + 卸货地 + +
    + + + + + +
    +     +     + + 联系人 +
    +
    + + + + + + +
    - -     - - 联系人 -
    - - - - - - -
    -     -
    -
    -
    -
    -
    +
    +
    +
    -
    -
    -
    - - 装货时间 - - - - +
    +
    + + 装货时间 + + + + +
    +
    +
    + + 卸货时间 + + + + +
    -
    -
    - - 卸货时间 - - - - + + + + + +
    货物信息
    +
    +
    + + + + + + 国家法规及行政命令禁限运货物不能托运 + 《禁运物品说明》 + + +
    - - -     + + + + + + + + + + + + + + + + + +
    + + +
    +     +     + - -
    货物信息
    -
    -
    - - - - - - 国家法规及行政命令禁限运货物不能托运 - 《禁运物品说明》 - - - -
    -
    - - - - - - - - - - - - - - - - - -
    - - + +
    服务信息
    +
    +
    + + +  货源曝光率 +10   +  车源匹配率 +10 + + +  货源曝光率 +20   +  车源匹配率 +20 + + + + + + + + ①香港、澳门、台湾、西藏、新疆不予承保，②单次运输保额仅限200万元以内，③保险详细内容及注意事项请见《保险告知函》 +
    - - - - - -
    服务信息
    -
    -
    - - -  货源曝光率 +10   -  车源匹配率 +10 - - -  货源曝光率 +20   -  车源匹配率 +20 - - - - - - - - ①香港、澳门、台湾、西藏、新疆不予承保，②单次运输保额仅限200万元以内，③保险详细内容及注意事项请见《保险告知函》 -
    -
    -     - -
    补充信息
    -
    -
    - - + + +
    补充信息
    +
    +
    + + +
    -
    - + - -
    运费信息
    -
    -
    - - - - - - - - - - - - - - {{ i.value | currency }} - {{ i.value | currency }}（费率：{{ currentRate | number: - '0.2-4' }}%） - {{ i.value | currency }} - -
    -
    - + +
    运费信息
    +
    +
    + + + + + + + + + + + + + + {{ i.value | currency }} + {{ i.value | currency }}（费率：{{ currentRate | number: + '0.2-4' }}%） + {{ i.value | currency }} + +
    +
    + +
    +
    +  天内支付运费 +
    -
    -  天内支付运费 -
    -
    - - + + +
    -
    - - -
    - - -
    -     + + +
    + + +
    +     +
    \ No newline at end of file diff --git a/src/app/routes/supply-management/components/release-publish/release-publish.component.less b/src/app/routes/supply-management/components/release-publish/release-publish.component.less index b34cbcc9..acb1655a 100644 --- a/src/app/routes/supply-management/components/release-publish/release-publish.component.less +++ b/src/app/routes/supply-management/components/release-publish/release-publish.component.less @@ -5,16 +5,16 @@ } nz-date-picker { - width: 94.3%; + width: 100%; } .sf3 { .goods_Tips_item { .goods_tips { - width: calc(50% - 45px); + width: calc(50% - 57px); .ant-alert { - padding: 0 0 0 2px; + margin-bottom: 5px; } } @@ -78,3 +78,100 @@ input[type='number']::-webkit-outer-spin-button { margin: 0; -webkit-appearance: none; } + +.custom-style { + ::ng-deep { + .ant-card { + margin-bottom: 0; + } + + .ant-card-body { + padding-bottom: 0; + } + + .ant-card-bordered { + border: 0 none; + } + + .card-title { + display: flex; + align-items: center; + + >span { + margin-left: 8px; + font-size: 14px; + + em { + font-style: normal; + color: #E60012; + } + } + + &::before { + content: ''; + display: inline-block; + width: 2px; + height: 16px; + margin-right: 10px; + background: #E60012; + } + } + + .ant-btn-dangerous { + border-radius: 4px; + color: #CF3834; + border-color: rgba(207, 56, 52, 0.5); + } + + .icon-wrap { + display: flex; + justify-content: center; + height: 100%; + } + + .swap-icon { + background: url('/assets/images/frame.png') no-repeat 50% 50%; + cursor: pointer; + } + + .ant-input-affix-wrapper, + .ant-input, + .ant-picker, + .ant-select-selector, + .ant-input-number-input, + .ant-input-number { + border-radius: 4px ; + } + .ant-input-group-addon { + border-radius: 0 4px 4px 0; + } + .align-center { + .ant-btn { + height: 40px; + padding: 0 23px; + font-size: 16px; + border-radius: 3px; + } + } + .ant-select-arrow { + transform: scaleX(1.5) translateY(2px); + color: rgb(153,153,153); + font-size: 8px; + } + .ant-picker-suffix { + color: #333; + } + .btn-wrap { + margin-top: 20px; + padding-bottom: 20px; + } + .ant-alert { + padding: 6px 16px; + border-radius: 2px; + font-size: 14px; + } + .fc { + color: #f5222d; + } + } +} \ No newline at end of file diff --git a/src/app/routes/supply-management/components/release-publish/release-publish.component.ts b/src/app/routes/supply-management/components/release-publish/release-publish.component.ts index b17688c4..9bd0c8c3 100644 --- a/src/app/routes/supply-management/components/release-publish/release-publish.component.ts +++ b/src/app/routes/supply-management/components/release-publish/release-publish.component.ts @@ -227,19 +227,19 @@ export class SupplyManagementReleasePublishComponent implements OnInit { this.ui1 = { '*': { spanLabelFixed: 115, - grid: { span: 12 } + grid: { span: 8 } }, $enterpriseInfoName: { - grid: { span: 12 } + grid: { span: 8 } }, $shipperAppUserId: { - grid: { span: 12 } + grid: { span: 8 } }, $enterpriseProjectId: { - grid: { span: 12 } + grid: { span: 8 } }, $dispatchId: { - grid: { span: 12 } + grid: { span: 8 } } }; } @@ -332,6 +332,9 @@ export class SupplyManagementReleasePublishComponent implements OnInit { spanLabelFixed: 115, grid: { span: 12 } }, + $goodsNameId: { + spanLabelFixed: 10 + }, $goodsTips: { grid: { span: 24 } } @@ -400,14 +403,14 @@ export class SupplyManagementReleasePublishComponent implements OnInit { } } }, - hidenField: { - type: 'string', - title: '', - default: ' ', - ui: { - widget: 'text' - } - }, + // hidenField: { + // type: 'string', + // title: '', + // default: ' ', + // ui: { + // widget: 'text' + // } + // }, insurancePackagedGoods: { type: 'string', title: '货物包装', @@ -444,7 +447,25 @@ export class SupplyManagementReleasePublishComponent implements OnInit { this.ui4 = { '*': { spanLabelFixed: 115, - grid: { span: 8 } + grid: { span: 12 } + }, + $weight: { + grid: { span: 4 } + }, + $volume: { + spanLabelFixed: 10, + grid: { span: 4 } + }, + $number: { + spanLabelFixed: 10, + grid: { span: 4 } + }, + $carModel: { + grid: { span: 6 } + }, + $carLength: { + spanLabelFixed: 10, + grid: { span: 6 } } }; } @@ -528,16 +549,16 @@ export class SupplyManagementReleasePublishComponent implements OnInit { this.ui5 = { '*': { spanLabelFixed: 115, - grid: { span: 12 } + grid: { span: 8 } }, $type1: { - grid: { span: 24 } + grid: { span: 8 } }, $type2: { - grid: { span: 24 } + grid: { span: 8 } }, $freeInsurance1: { - grid: { span: 24 } + grid: { span: 24} }, $freeInsurance2: { grid: { span: 24 } @@ -626,7 +647,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit { ui: { widget: 'textarea', placeholder: '请输入', - autosize: { minRows: 3, maxRows: 3 } + autosize: { minRows: 1, maxRows: 1 } } as SFTextareaWidgetSchema } }, @@ -634,7 +655,10 @@ export class SupplyManagementReleasePublishComponent implements OnInit { }; this.ui6 = { '*': { - spanLabelFixed: 90, + spanLabelFixed: 125, + grid: { span: 8 } + }, + $remarks: { grid: { span: 24 } } }; @@ -675,6 +699,9 @@ export class SupplyManagementReleasePublishComponent implements OnInit { this.ui7 = { '*': { spanLabelFixed: 115, + grid: { span: 8 } + }, + $paymentDays: { grid: { span: 24 } } }; diff --git a/src/app/routes/ticket-management/components/billing-order/billing-order.component.html b/src/app/routes/ticket-management/components/billing-order/billing-order.component.html index e6588a35..a910e29d 100644 --- a/src/app/routes/ticket-management/components/billing-order/billing-order.component.html +++ b/src/app/routes/ticket-management/components/billing-order/billing-order.component.html @@ -25,14 +25,6 @@ - - 待受理 - 处理中 - 已完成 - 已拒绝 - 已撤销 - 已作废 - {{item.billTypeLabel + item.serviceTypeLabel}} diff --git a/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts b/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts index 57ea5983..05b9d0f9 100644 --- a/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts +++ b/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts @@ -281,7 +281,7 @@ export class BillingOrderComponent implements OnInit { { title: '卸货时间', index: 'unloadTime', type: 'date', width: '150px', className: 'text-center' }, { title: '订单完成时间', index: 'orderReceivingTime', type: 'date', width: 150, className: 'text-center' }, { title: '支付完成时间', index: 'overallPaymentTime', type: 'date', width: 150, className: 'text-center' }, - { title: '开票状态', index: 'sts', render: 'sts', className: 'text-center', width: 120 }, + { title: '开票状态', index: 'stsLabel', className: 'text-center', width: 120 }, { title: '申请开票时间', index: 'vatappdate', type: 'date', className: 'text-center', width: 180 }, { title: '申请开票编号', index: 'vatappcode', className: 'text-center', width: 190 }, { title: '分票编号', index: 'vatinvcode', width: '200px', className: 'text-center' }, diff --git a/src/assets/images/frame.png b/src/assets/images/frame.png new file mode 100644 index 0000000000000000000000000000000000000000..d816e711c615b630b340ee5ad979aa45260cd4a8 GIT binary patch literal 710 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k3?#4J%UA`Z7>k44ofy`glX(f`Y!C1WaRt&0 z4*wYv{xf9#XDIm3kOpQH{%6Sj&yf9}Ap^_+O6C7&$N`Jw!9;)xfFcksgaoRA=mK(q zQV=dg3MdX_K-kC(h&Y-okc%b)*9a3&ZU1rx=yIEqAirP+77iW(5eaD-c?D$^bq#GD zeFF~S3{#&PYKPNC) zN=O^0c#)+%gzSI*(;!nAZs5Vwr!sq*;^c{7aHyw%ia4!*>=$CK6QijdFR zV+NCL=4=dbc_OK%7hLM{S^c~B!OMag_w5_g1t)Hh&=nAzI8*z9t8|QL6b{m-*G}(~1Jz z4{y0pBJUUc(fP5BzoMqe+?d>ltM6R=>wjbF@%76aBkf$o^&8%Wv%FZxD9eAlH1kf+ zBc6!+awo3TtmR3s`8IhL|58K#zP)T~@5}etZ^-wa77{Lh-{%D=4SKrzxvX Date: Sat, 7 May 2022 11:09:39 +0800 Subject: [PATCH 03/14] fix bug --- .../audit/detail/detail.component.html | 40 +++++++++++++++++-- 1 file changed, 37 insertions(+), 3 deletions(-) diff --git a/src/app/routes/vehicle/components/audit/detail/detail.component.html b/src/app/routes/vehicle/components/audit/detail/detail.component.html index 40eb67d3..9728c26b 100644 --- a/src/app/routes/vehicle/components/audit/detail/detail.component.html +++ b/src/app/routes/vehicle/components/audit/detail/detail.component.html @@ -70,7 +70,20 @@
    - 车辆基础信息 +

    + 车辆基础信息 + +

    @@ -147,7 +160,20 @@
    - 行驶证信息 +

    + 行驶证信息 + +

    @@ -243,7 +269,15 @@

    道路运输证信息

    车辆基础信息

    行驶证信息 +

    @@ -173,6 +176,9 @@ +

    From 3229f8275495ef8304f29ee1c8984502692ae4a0 Mon Sep 17 00:00:00 2001 From: weiyu Date: Sat, 7 May 2022 11:31:59 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bulk-publish/bulk-publish.component.html | 8 +- .../bulk-release-publish.component.html | 389 ++++++++---------- .../bulk-release-publish.component.less | 97 +++++ .../bulk-release-publish.component.ts | 42 +- 4 files changed, 296 insertions(+), 240 deletions(-) diff --git a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html index 8e7b3d7c..7bd237d5 100644 --- a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html +++ b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html @@ -106,7 +106,7 @@ + (ngModelChange)="i.setValue($event)" [nzPrecision]="2" style="width: 100%;border-radius: 4px 0 0 4px;"> @@ -135,19 +135,19 @@ + style="width: 100%;border-radius: 4px 0 0 4px;"> + style="width: 100%;border-radius: 4px 0 0 4px;"> + style="width: 100%;border-radius: 4px 0 0 4px;"> diff --git a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html index 20624310..a9b8a94f 100644 --- a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html +++ b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html @@ -5,233 +5,182 @@ - -
    货源单设置
    - - {{ i.value }} - -     +
    + +
    货源单设置
    + + {{ i.value }} + +     - -
    装卸货信息预计公里数：{{ totalDistance }}km，预计行程耗时：{{ totalTime }}小时
    - -
    -
    -
    -
    - - 装货地 - -
    - - - -
    -     -     - - 联系人 -
    - - - - - - -
    -     -
    -
    -
    -
    - -
    -
    -
    -
    - - 卸货地 - -
    - - - -
    -     -     - - 联系人 -
    - - - - - - -
    -     -
    -
    + +
    装卸货信息预计公里数：{{ totalDistance }}km，预计行程耗时：{{ totalTime }}小时
    - - -     - -
    货物信息
    -
    -
    - - - - - - - - - - - - - -
    - - - - - - - -

    例如 付司机运费 = 重量*单价 = 999.99

    -

    保留小数，即 999.99

    -

    抹除小数，即 999.00

    -

    抹除个位，即 990.00

    +
    +
    +
    +
    + + 装货地 + +
    + + + +
    +     +     + + 联系人 +
    +
    + + + + + + +
    +
    +     + +
    +
    +
    +
    + +
    +
    +
    +
    + + 卸货地 + +
    + + + +
    +     +     + + 联系人 +
    +
    + + + + + + +
    +
    +     +
    +
    +
    + +
    + + + +
    货物信息
    +
    +
    + + + + + + + + + + + -
    - - - - - - - - - - - - - - - - - + + +
    + + + + + + + +

    例如 付司机运费 = 重量*单价 = 999.99

    +

    保留小数，即 999.99

    +

    抹除小数，即 999.00

    +

    抹除个位，即 990.00

    +     +
    +     + + + + + + + + + + + + + + + + +
    -
    - + - -
    补充信息
    -
    -
    - - -
    -
    -
    - -
    -
    -  天内支付运费 + +
    补充信息
    +
    +
    + + +
    +
    +
    + +
    +
    +  天内支付运费 +
    -
    - - + + +
    -
    - + - -
    - - - - -
    -     + +
    + + + + +
    +     +
    \ No newline at end of file diff --git a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.less b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.less index 6abb9df7..01ea397a 100644 --- a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.less +++ b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.less @@ -46,3 +46,100 @@ input[type='number']::-webkit-outer-spin-button { margin: 0; -webkit-appearance: none; } + +.custom-style { + ::ng-deep { + .ant-card { + margin-bottom: 0; + } + + .ant-card-body { + padding-bottom: 0; + } + + .ant-card-bordered { + border: 0 none; + } + + .card-title { + display: flex; + align-items: center; + + >span { + margin-left: 8px; + font-size: 14px; + + em { + font-style: normal; + color: #E60012; + } + } + + &::before { + content: ''; + display: inline-block; + width: 2px; + height: 16px; + margin-right: 10px; + background: #E60012; + } + } + + .ant-btn-dangerous { + border-radius: 4px; + color: #CF3834; + border-color: rgba(207, 56, 52, 0.5); + } + + .icon-wrap { + display: flex; + justify-content: center; + height: 100%; + } + + .swap-icon { + background: url('/assets/images/frame.png') no-repeat 50% 50%; + cursor: pointer; + } + + .ant-input-affix-wrapper, + .ant-input, + .ant-picker, + .ant-select-selector, + .ant-input-number-input, + .ant-input-number { + border-radius: 4px ; + } + .ant-input-group-addon { + border-radius: 0 4px 4px 0; + } + .align-center { + .ant-btn { + height: 40px; + padding: 0 23px; + font-size: 16px; + border-radius: 3px; + } + } + .ant-select-arrow { + transform: scaleX(1.5) translateY(2px); + color: rgb(153,153,153); + font-size: 8px; + } + .ant-picker-suffix { + color: #333; + } + .btn-wrap { + margin-top: 20px; + padding-bottom: 20px; + } + .ant-alert { + padding: 6px 16px; + border-radius: 2px; + font-size: 14px; + } + .fc { + color: #f5222d; + } + } +} diff --git a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts index 789f2339..655daf5a 100644 --- a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts +++ b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts @@ -223,11 +223,8 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit { }; this.ui1 = { '*': { - spanLabelFixed: 110, - grid: { span: 12 } - }, - $enterpriseInfoName: { - grid: { span: 24 } + spanLabelFixed: 115, + grid: { span: 8 } } }; } @@ -303,8 +300,14 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit { }; this.ui3 = { '*': { - spanLabelFixed: 90, + spanLabelFixed: 115, grid: { span: 12 } + }, + $goodsNameId: { + spanLabelFixed: 10 + }, + $goodsTips: { + grid: { span: 24 } } }; } @@ -411,33 +414,37 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit { }; this.ui4 = { '*': { - spanLabelFixed: 90, - grid: { span: 24 } + spanLabelFixed: 115, + grid: { span: 12 } }, $freightPrice: { grid: { span: 8 } }, $rule: { + spanLabelFixed: 10, grid: { span: 8 } }, $settlementBasis: { + spanLabelFixed: 10, grid: { span: 8 } }, $weight: { - grid: { lg: 8, md: 12, sm: 12, xs: 24 } + grid: { span: 4 } }, $volume: { - grid: { lg: 8, md: 12, sm: 12, xs: 24 } + spanLabelFixed: 10, + grid: { span: 4 } }, $number: { - grid: { lg: 8, md: 12, sm: 12, xs: 24 } + spanLabelFixed: 10, + grid: { span: 4 } }, $carModel: { - spanLabelFixed: 120, - grid: { span: 8 } + grid: { span: 6 } }, $carLength: { - grid: { span: 8 } + spanLabelFixed: 10, + grid: { span: 6 } } }; } @@ -527,7 +534,7 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit { ui: { widget: 'textarea', placeholder: '请输入', - autosize: { minRows: 3, maxRows: 3 } + autosize: { minRows: 1, maxRows: 1 } } as SFTextareaWidgetSchema } }, @@ -535,7 +542,10 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit { }; this.ui6 = { '*': { - spanLabelFixed: 90, + spanLabelFixed: 115, + grid: { span: 8 } + }, + $remarks: { grid: { span: 24 } } }; From 1d76809e3a034eaa540e7a69c0c6efe0792d338b Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Sat, 7 May 2022 13:29:42 +0800 Subject: [PATCH 07/14] UI --- proxy.conf.js | 2 +- src/app/global-config.module.ts | 1 + src/app/routes/commom/less/commom-table.less | 8 +-- .../fund-reporting.component.less | 5 -- .../fund-reporting.component.spec.ts | 24 -------- .../freight/list/list.component.html | 42 ++++++++++--- .../components/freight/list/list.component.ts | 60 ++++++++++--------- 7 files changed, 72 insertions(+), 70 deletions(-) delete mode 100644 src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.less delete mode 100644 src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.spec.ts diff --git a/proxy.conf.js b/proxy.conf.js index d58ece8c..21093efc 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -30,7 +30,7 @@ module.exports = { // }, '//api': { target: { - host: 'tms-api-dev.eascs.com', + host: 'tms-api-test.eascs.com', protocol: 'https:', port: 443 }, diff --git a/src/app/global-config.module.ts b/src/app/global-config.module.ts index faeed3b0..8ffa9a12 100644 --- a/src/app/global-config.module.ts +++ b/src/app/global-config.module.ts @@ -12,6 +12,7 @@ import { environment } from '@env/environment'; const alainConfig: AlainConfig = { st: { + bordered: true, req: { method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' } }, res: { reName: { list: 'data.records', total: 'data.total' } }, page: { show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000], toTop: false }, diff --git a/src/app/routes/commom/less/commom-table.less b/src/app/routes/commom/less/commom-table.less index 152d7534..ff5ea6f4 100644 --- a/src/app/routes/commom/less/commom-table.less +++ b/src/app/routes/commom/less/commom-table.less @@ -113,9 +113,9 @@ line-height: 21px; } - .text-truncate { - white-space: normal; - } + // .text-truncate { + // white-space: normal; + // } } } @@ -138,4 +138,4 @@ } } -.height_box{} \ No newline at end of file +.height_box {} \ No newline at end of file diff --git a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.less b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.less deleted file mode 100644 index 6009fbbf..00000000 --- a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.less +++ /dev/null @@ -1,5 +0,0 @@ -:host { - .text-black { - color: #000; - } -} diff --git a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.spec.ts b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.spec.ts deleted file mode 100644 index fb500388..00000000 --- a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.spec.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; -import { DatatableFundReportingComponent } from './fund-reporting.component'; - -describe('DatatableFundReportingComponent', () => { - let component: DatatableFundReportingComponent; - let fixture: ComponentFixture; - - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [DatatableFundReportingComponent] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(DatatableFundReportingComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/routes/usercenter/components/freight/list/list.component.html b/src/app/routes/usercenter/components/freight/list/list.component.html index 018efd10..d8652768 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.html +++ b/src/app/routes/usercenter/components/freight/list/list.component.html @@ -26,15 +26,23 @@
    -
    - +
    +
    + + +
    +
      +
    • + 高级筛选 +
    • 新增企业
      • @@ -52,8 +60,7 @@ - -
      + @@ -68,16 +75,35 @@ - {{ item.contacter }}
      /{{item.mobile}} +

      + {{ item.contacter }} +

      +       + +

      + {{ item.customerServiceIdLabel }} +

      - {{ item.partnerName }}
      /{{item.partnerMobile}} +

      + {{ item.partnerName }} +

      - {{ item.channelName }}
      {{ item.channelMobile }} +

      + {{ item.channelName }} +

      diff --git a/src/app/routes/usercenter/components/freight/list/list.component.ts b/src/app/routes/usercenter/components/freight/list/list.component.ts index 2d8995c3..70185274 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.ts +++ b/src/app/routes/usercenter/components/freight/list/list.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; -import { STChange, STColumn, STColumnBadge, STComponent, STData, STRequestOptions } from '@delon/abc/st'; -import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form'; +import { STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st'; +import { SFDateWidgetSchema } from '@delon/form'; import { DynamicSettingModalComponent, SearchDrawerService, ShipperBaseService } from '@shared'; import { NzModalService } from 'ng-zorro-antd/modal'; import { BasicTableComponent } from 'src/app/routes/commom'; @@ -24,6 +24,9 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen promotersTelephone = ''; loadingList = true; + + sfValue = { enterpriseName: '', contactName: '' }; + constructor( public service: UsermanageService, private modal: NzModalService, @@ -195,12 +198,6 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen initSF() { this.schema = { properties: { - expand: { - type: 'boolean', - ui: { - hidden: true - } - }, enterpriseName: { title: '企业名称', type: 'string', @@ -340,7 +337,7 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen { label: '全部', value: '' }, { label: '货主注册', value: 1 }, { label: '平台添加', value: 2 }, - { label: '数据迁移', value: 4 }, + { label: '数据迁移', value: 4 } ], default: '', ui: { @@ -377,24 +374,31 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen initST() { this.columns = [ { title: '', type: 'checkbox', className: 'text-center' }, - { title: '企业名称', render: 'enterpriseName', width: 350 }, - { title: '统一社会信用代码', className: 'text-center', render: 'unifiedSocialCreditCode', width: 200 }, + { + title: '企业名称', + index: 'enterpriseName', + width: 250, + type: 'link', + click: item => this.router.navigate(['./detail', item.id], { relativeTo: this.ar }) + }, + { title: '企业评分', className: 'text-center', render: 'score', width: 160 }, { title: '公司所在地', - className: 'text-center', index: 'province', width: 200, format: item => `${item.provinceName}${item.cityName}${item.areaName}` }, + { title: '管理员', render: 'contacter', width: 150 }, + { title: '统一社会信用代码', className: 'text-center', render: 'unifiedSocialCreditCode', width: 200 }, { title: '企业类型', className: 'text-center', index: 'enterpriseType', - width: 200, + width: 160, type: 'enum', enum: { 1: '物流企业', 2: '货运代理', 3: '生产型企业', 4: '贸易类企业', 5: '科技型企业', 6: '化学化工企业', 7: '其他' } }, - { title: '管理员', className: 'text-center', render: 'contacter', width: 150 }, + { title: '常用服务', className: 'text-center', @@ -405,14 +409,14 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen }, { title: '渠道销售', className: 'text-center', render: 'promotersTelephone', width: 150 }, { title: '合伙人', className: 'text-center', render: 'partnerName', width: 150 }, - { title: '客服人员', className: 'text-center', index: 'customerServiceIdLabel', width: 150 }, + { title: '客服人员', className: 'text-center', render: 'customerServiceIdLabel', width: 150 }, { title: '网络货运人', className: 'text-center', index: 'netTranName', width: 180 }, { title: '注册渠道', className: 'text-center', index: 'source', type: 'enum', - enum: { 1: '货主注册', 2: '平台添加', 3: '运营添加', 4: '数据迁移' }, + enum: { 1: '货主注册', 2: '平台添加', 3: '运营添加', 4: '数据迁移' }, width: 130 }, { title: '申请时间', className: 'text-center', index: 'createTime', width: 180, type: 'date' }, @@ -442,18 +446,18 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen }, { title: '操作', - width: '200px', - className: 'text-center block-td', + width: '180px', + className: 'text-center ', fixed: 'right', buttons: [ - { - text: '查看', - acl: { ability: ['USERCENTER-FREIGHT-LIST-view'] }, - click: item => { - this.router.navigate(['./detail', item.id], { relativeTo: this.ar }); - // this.router.navigate(['./view', item.id], { relativeTo: this.ar, queryParams: { tenantId: item.tenantId } }); - } - }, + // { + // text: '查看', + // acl: { ability: ['USERCENTER-FREIGHT-LIST-view'] }, + // click: item => { + // this.router.navigate(['./detail', item.id], { relativeTo: this.ar }); + // // this.router.navigate(['./view', item.id], { relativeTo: this.ar, queryParams: { tenantId: item.tenantId } }); + // } + // }, // { // acl: { ability: ['USERCENTER-FREIGHT-LIST-basicSetting'] }, // text: '基础设置', @@ -465,9 +469,9 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen click: item => this.showAccountDetail(item) }, { - text: '分配客服人员', + text: '分配客服', click: item => this.showService(item) - }, + } // { // text: '修改合伙人', // click: item => this.editPartner(item) From 2e3f5d65a5703046ec19c6a18b9322ab02a0c21e Mon Sep 17 00:00:00 2001 From: wangshiming Date: Sat, 7 May 2022 13:49:47 +0800 Subject: [PATCH 08/14] fix bug --- proxy.conf.js | 4 +-- .../operationtable.component.ts | 25 +++++++++++++------ .../routes/datatable/services/data.service.ts | 2 ++ 3 files changed, 22 insertions(+), 9 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index 28ccca86..958626b6 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-18 09:51:21 * @LastEditors : Shiming - * @LastEditTime : 2022-05-07 10:35:23 + * @LastEditTime : 2022-05-07 11:27:16 * @FilePath : \\tms-obc-web\\proxy.conf.js * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -30,7 +30,7 @@ module.exports = { // }, '//api': { target: { - host: 'tms-api-dev.eascs.com', + host: 'tms-api-test.eascs.com', protocol: 'https:', port: 443 }, diff --git a/src/app/routes/datatable/components/operationtable/operationtable.component.ts b/src/app/routes/datatable/components/operationtable/operationtable.component.ts index 15a0571c..aa8b8e33 100644 --- a/src/app/routes/datatable/components/operationtable/operationtable.component.ts +++ b/src/app/routes/datatable/components/operationtable/operationtable.component.ts @@ -73,9 +73,9 @@ export class DatatableOperationtableComponent implements OnInit { } initPillarData(flag?: boolean){ let type = 1 - if(this.mode === 'year') { + if(this.modeNext === 'year') { type = 1 - } else if(this.mode === 'month') { + } else if(this.modeNext === 'month') { type = 2 } const params: any = { @@ -126,7 +126,18 @@ export class DatatableOperationtableComponent implements OnInit { // Can not select days before today and today differenceInCalendarDays(current, this.today) > 0; exportFun() { - + let type = 1 + if(this.mode === 'year') { + type = 1 + } else if(this.mode === 'month') { + type = 2 + } + const params: any = { + time: this.time, + type, + enterpriseInfoId: this.enterpriseInfoId + }; + this.service.exportStart({ ...params, pageSize: -1 }, this.service.$api_asyncExportOperationalReport); } changeCurve(){ @@ -135,9 +146,9 @@ export class DatatableOperationtableComponent implements OnInit { } changeDataNext() { - if(this.mode === 'year') { + if(this.modeNext === 'year') { this.dateFormat = 'yyyy' - } else if(this.mode === 'month') { + } else if(this.modeNext === 'month') { this.dateFormat = 'yyyy-MM' } } @@ -145,9 +156,9 @@ export class DatatableOperationtableComponent implements OnInit { if(result === null) { return } - if(this.mode === 'year') { + if(this.modeNext === 'year') { this.timeNext = [this.datePipe.transform(this.dateNext, 'yyyy') + '-01-01 00:00:00'] - } else if(this.mode === 'month') { + } else if(this.modeNext === 'month') { this.timeNext = [this.datePipe.transform(this.dateNext, 'yyyy-MM') + '-01 00:00:00'] } this.initPillarData(true) diff --git a/src/app/routes/datatable/services/data.service.ts b/src/app/routes/datatable/services/data.service.ts index adea49fc..ca0bac57 100644 --- a/src/app/routes/datatable/services/data.service.ts +++ b/src/app/routes/datatable/services/data.service.ts @@ -107,6 +107,8 @@ export class DataService extends ShipperBaseService { $api_total_freight = `/api/sdc/reportData/getTotalFreight`; // 附加费总额 $api_total_surcharge = `/api/sdc/reportData/getTotalSurcharge`; + // 运营导出 + $api_asyncExportOperationalReport = `/api/sdc/report/asyncExportOperationalReport`; From 1ef81780c224990ab891bb2cd58ae5dce0724bbe Mon Sep 17 00:00:00 2001 From: wangshiming Date: Sat, 7 May 2022 13:53:05 +0800 Subject: [PATCH 09/14] fix bug --- .../routes/order-management/components/bulk/bulk.component.ts | 2 +- .../order-management/components/vehicle/vehicle.component.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/routes/order-management/components/bulk/bulk.component.ts b/src/app/routes/order-management/components/bulk/bulk.component.ts index 0dd9918b..1bcfb1c8 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.ts +++ b/src/app/routes/order-management/components/bulk/bulk.component.ts @@ -290,7 +290,7 @@ export class OrderManagementBulkComponent extends BasicTableComponent implements placeholder: '请选择', } }, - enterpriseInfoName: { + enterpriseInfoId: { type: 'string', title: '网络货运人', ui: { diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.ts b/src/app/routes/order-management/components/vehicle/vehicle.component.ts index 7bec1594..72ca5609 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -297,7 +297,7 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme placeholder: '请选择' } }, - enterpriseInfoName: { + enterpriseInfoId: { type: 'string', title: '网络货运人', ui: { From 72dc31a6260d6200533f55deeccb4fe6dfd6add0 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Sat, 7 May 2022 14:02:10 +0800 Subject: [PATCH 10/14] fix bug --- proxy.conf.js | 4 ++-- .../components/operationtable/operationtable.component.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index 958626b6..abb6987d 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-18 09:51:21 * @LastEditors : Shiming - * @LastEditTime : 2022-05-07 11:27:16 + * @LastEditTime : 2022-05-07 14:00:05 * @FilePath : \\tms-obc-web\\proxy.conf.js * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -30,7 +30,7 @@ module.exports = { // }, '//api': { target: { - host: 'tms-api-test.eascs.com', + host: 'tms-api-dev.eascs.com', protocol: 'https:', port: 443 }, diff --git a/src/app/routes/datatable/components/operationtable/operationtable.component.html b/src/app/routes/datatable/components/operationtable/operationtable.component.html index b3587bb0..5d8f4db9 100644 --- a/src/app/routes/datatable/components/operationtable/operationtable.component.html +++ b/src/app/routes/datatable/components/operationtable/operationtable.component.html @@ -45,14 +45,14 @@
    - +
    \ No newline at end of file From 18259ad5194e5329b2edffd088de8ff7fd142818 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Sat, 7 May 2022 14:44:38 +0800 Subject: [PATCH 11/14] edit --- .../index/menu-modal/menu-modal.component.ts | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/app/routes/menu-manager/components/index/menu-modal/menu-modal.component.ts b/src/app/routes/menu-manager/components/index/menu-modal/menu-modal.component.ts index 2dc63603..d7d39505 100644 --- a/src/app/routes/menu-manager/components/index/menu-modal/menu-modal.component.ts +++ b/src/app/routes/menu-manager/components/index/menu-modal/menu-modal.component.ts @@ -72,6 +72,16 @@ export class MenuModalComponent implements OnInit { widget: 'radio' } }, + reuse: { + title: '是否缓存页面', + type: 'boolean', + default: this.formData.reuse || false, + enum: [true, false], + readOnly: this.isDisabled, + ui: { + widget: 'radio' + } + }, link: { title: '菜单路由', type: 'string', From 16babe9622a158892bf3b0e3f4212afa2ffa6479 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Sat, 7 May 2022 14:48:26 +0800 Subject: [PATCH 12/14] fix bug --- proxy.conf.js | 4 ++-- .../contract-template-detail.component.ts | 8 +++++--- .../contract-template/contract-template.component.ts | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index abb6987d..25a048b9 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-18 09:51:21 * @LastEditors : Shiming - * @LastEditTime : 2022-05-07 14:00:05 + * @LastEditTime : 2022-05-07 14:30:27 * @FilePath : \\tms-obc-web\\proxy.conf.js * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -30,7 +30,7 @@ module.exports = { // }, '//api': { target: { - host: 'tms-api-dev.eascs.com', + host: 'tms-api-test.eascs.com', protocol: 'https:', port: 443 }, diff --git a/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts b/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts index f355dec3..2ee737cc 100644 --- a/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts +++ b/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts @@ -5,7 +5,7 @@ import { OnChanges } from '@angular/core'; * @Author : Shiming * @Date : 2022-01-05 11:01:55 * @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 * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -94,7 +94,8 @@ export class ContractManagementTemplateTextComponent implements OnInit { { label: '订单补充协议', value: '2' }, { label: '运单合同', value: '3' }, { label: '运单补充协议', value: '4' }, - { label: '委托代收合同', value: '5' } + { label: '委托代收合同', value: '5' }, + { label: '权力义务转让协议', value: '10' }, ]; this.sf.getProperty('/contractType')!.schema.enum = this.Types; this.sf.getProperty('/contractType')!.widget.reset(this.Types); @@ -217,7 +218,8 @@ export class ContractManagementTemplateTextComponent implements OnInit { { label: '订单补充协议', value: '2' }, { label: '运单合同', value: '3' }, { label: '运单补充协议', value: '4' }, - { label: '委托代收合同', value: '5' } + { label: '委托代收合同', value: '5' }, + { label: '权力义务转让协议', value: '10' }, ]; setTimeout(() => { if (this.sf) { diff --git a/src/app/routes/contract-management/components/contract-template/contract-template.component.ts b/src/app/routes/contract-management/components/contract-template/contract-template.component.ts index 71f198d2..4b424a00 100644 --- a/src/app/routes/contract-management/components/contract-template/contract-template.component.ts +++ b/src/app/routes/contract-management/components/contract-template/contract-template.component.ts @@ -245,7 +245,7 @@ export class ContractManagementTemplateDetailComponent implements OnInit { this.service.request(this.service.$api_deletebatch_contractTemplate, [value.id]).subscribe(res => { if (res) { this.service.msgSrv.success('删除成功！'); - this.st.reload(1) + this.st.reload() } }) }); From 93b7985330457ce3b14bfe9bca9843d7c0df84a2 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Sat, 7 May 2022 14:57:17 +0800 Subject: [PATCH 13/14] fix bug --- proxy.conf.js | 4 ++-- .../partner/level-config/components/list/list.component.ts | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index 25a048b9..6ca24ab5 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-18 09:51:21 * @LastEditors : Shiming - * @LastEditTime : 2022-05-07 14:30:27 + * @LastEditTime : 2022-05-07 14:49:15 * @FilePath : \\tms-obc-web\\proxy.conf.js * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -30,7 +30,7 @@ module.exports = { // }, '//api': { target: { - host: 'tms-api-test.eascs.com', + host: 'tms-api-dev.eascs.com', protocol: 'https:', port: 443 }, diff --git a/src/app/routes/partner/level-config/components/list/list.component.ts b/src/app/routes/partner/level-config/components/list/list.component.ts index 637a23ee..12b39be1 100644 --- a/src/app/routes/partner/level-config/components/list/list.component.ts +++ b/src/app/routes/partner/level-config/components/list/list.component.ts @@ -195,6 +195,5 @@ export class ParterLevelConfigListComponent implements OnInit { */ resetSF() { this.sf.reset(); - this.st.load(1); } } From 513821eeeec9385092cb4150d92faf23b14ed777 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Sat, 7 May 2022 15:02:38 +0800 Subject: [PATCH 14/14] fix bug --- .../components/bulk-publish/bulk-publish.component.ts | 8 ++++---- .../onecar-publish/onecar-publish.component.ts | 8 ++++---- .../release-publish/release-publish.component.ts | 10 +++++----- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts index 2a4d764b..1229c193 100644 --- a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts +++ b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts @@ -223,7 +223,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit { }, goodsTypeId: { type: 'string', - title: '货物名称', + title: '货物类型', ui: { widget: 'select', placeholder: '请选择', @@ -255,7 +255,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit { ui: { widget: 'select', placeholder: '请选择', - errors: { required: '请填写货物名称' }, + errors: { required: '请填写货物类型' }, change: (value: any, data: any) => { this.sf3.setValue('/goodsName', data.label); }, @@ -279,7 +279,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit { title: '', maxLength: 20, ui: { - errors: { required: '请填写货物名称' }, + errors: { required: '请填写货物类型' }, visibleIf: { goodsTypeName: (value: any) => value && value === '其它' }, @@ -1162,7 +1162,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit { this.service.request(this.service.$api_checkGoodsName, name).subscribe(res => { if (res === false) { const modalRef = this.modalService.error({ - nzTitle: '货物名称含有违禁词，请重新输入！', + nzTitle: '货物类型含有违禁词，请重新输入！', }); modalRef.afterClose.subscribe(result => { // this.sf3.setValue('/goodsName1', null); diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts index 4d823afa..9efffd38 100644 --- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts +++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts @@ -269,7 +269,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { }, goodsTypeId: { type: 'string', - title: '货物名称', + title: '货物类型', ui: { widget: 'select', placeholder: '请选择', @@ -301,7 +301,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { ui: { widget: 'select', placeholder: '请选择', - errors: { required: '请填写货物名称' }, + errors: { required: '请填写货物类型' }, change: (_value: any, data: any) => { this.sf3.setValue('/goodsName', data.label); }, @@ -325,7 +325,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { title: '', maxLength: 20, ui: { - errors: { required: '请填写货物名称' }, + errors: { required: '请填写货物类型' }, visibleIf: { goodsTypeName: (value: any) => value && value === '其它' }, @@ -1510,7 +1510,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { this.service.request(this.service.$api_checkGoodsName, name).subscribe(res => { if (res === false) { const modalRef = this.modalService.error({ - nzTitle: '货物名称含有违禁词，请重新输入！', + nzTitle: '货物类型含有违禁词，请重新输入！', }); modalRef.afterClose.subscribe(result => { // this.sf3.setValue('/goodsName1', null); diff --git a/src/app/routes/supply-management/components/release-publish/release-publish.component.ts b/src/app/routes/supply-management/components/release-publish/release-publish.component.ts index 9bd0c8c3..a457bfcd 100644 --- a/src/app/routes/supply-management/components/release-publish/release-publish.component.ts +++ b/src/app/routes/supply-management/components/release-publish/release-publish.component.ts @@ -259,11 +259,11 @@ export class SupplyManagementReleasePublishComponent implements OnInit { }, goodsTypeId: { type: 'string', - title: '货物名称', + title: '货物类型', ui: { widget: 'select', placeholder: '请选择', - errors: { required: '请选择货物名称' }, + errors: { required: '请选择货物类型' }, asyncData: () => this.shipperSrv.loadConfigByKey('goods.name.config.type').pipe( map((data: any) => { @@ -291,7 +291,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit { ui: { widget: 'select', placeholder: '请选择', - errors: { required: '请填写货物名称' }, + errors: { required: '请填写货物类型' }, change: (value: any, data: any) => { this.sf3.setValue('/goodsName', data.label); }, @@ -315,7 +315,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit { title: '', maxLength: 20, ui: { - errors: { required: '请填写货物名称' }, + errors: { required: '请填写货物类型' }, visibleIf: { goodsTypeName: (value: any) => value && value === '其它' }, @@ -1294,7 +1294,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit { this.service.request(this.service.$api_checkGoodsName, name).subscribe(res => { if (res === false) { const modalRef = this.modalService.error({ - nzTitle: '货物名称含有违禁词，请重新输入！', + nzTitle: '货物类型含有违禁词，请重新输入！', }); modalRef.afterClose.subscribe(result => { // this.sf3.setValue('/goodsName1', null);