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 5db9b5ff..b29ce305 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.ts +++ b/src/app/routes/order-management/components/bulk/bulk.component.ts @@ -552,6 +552,11 @@ export class OrderManagementBulkComponent extends BasicTableComponent implements click: _record => this.changeOrder(_record), iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3', acl: { ability: ['ORDER-BULK-BulkBillDetail'] } + },{ + text: '订单上报推送', + click: _record => this.orderReportPush(_record), + iif: item => item.overallPaymentStatus === '2' && (item.billStatus === '4' || item.billStatus === '5') + // acl: { ability: ['VEHICLE-LIST-view'] }, } ] } @@ -659,6 +664,15 @@ export class OrderManagementBulkComponent extends BasicTableComponent implements this.changeId = item.id; this.isVisible = true; } + + orderReportPush(item: any) { + this.service.request(this.service.$api_manualOrderSubmission,{id: item.id}).subscribe( res=> { + if(res) { + this.st.reload(this.st.pi) + this.service.msgSrv.success('推送成功'); + } + }) + } /** * 浮动费用查看 */ diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.html b/src/app/routes/order-management/components/vehicle/vehicle.component.html index 542019b6..c6c12082 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.html +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.html @@ -50,7 +50,7 @@ + [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [loading]="service.http.loading"> {{ item.billCode }}
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 ef242949..19b0ddd9 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -469,6 +469,12 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme click: _record => this.viewTrack(_record), iif: item => item.billStatus !== '1' && item.billStatus !== '6' // acl: { ability: ['VEHICLE-LIST-view'] }, + }, + { + text: '订单上报推送', + click: _record => this.orderReportPush(_record), + iif: item => item.overallPaymentStatus === '2' && (item.billStatus === '4' || item.billStatus === '5') + // acl: { ability: ['VEHICLE-LIST-view'] }, } ] } @@ -738,6 +744,16 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme }); } + // 订单上报推送 + orderReportPush(item: any) { + this.service.request(this.service.$api_manualOrderSubmission,{id: item.id}).subscribe( res=> { + if(res) { + this.st.reload(this.st.pi) + this.service.msgSrv.success('推送成功'); + } + }) + } + // *确认签收 confirmReceipt(item: any) { diff --git a/src/app/routes/order-management/services/order-management.service.ts b/src/app/routes/order-management/services/order-management.service.ts index 087d7a70..f68ed55c 100644 --- a/src/app/routes/order-management/services/order-management.service.ts +++ b/src/app/routes/order-management/services/order-management.service.ts @@ -219,6 +219,8 @@ export class OrderManagementService extends ShipperBaseService { public $api_getBillTakeGoods = `/api/sdc/billOperate/getBillTakeGoods`; // 生成提/卸货单 public $api_createBillEsignGoods = `/api/sdc/billOperate/createBillEsignGoods`; + // 订单上报推送 + $api_manualOrderSubmission = '/api/sdc/billOperate/manualOrderSubmission'; // // 生成卸货单 // public $api_createBillDischargeGoods = `/api/sdc/billOperate/createBillDischargeGoods`; diff --git a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html index 00606c3d..601a0121 100644 --- a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html @@ -1,5 +1,5 @@
- + - - + + +
@@ -27,7 +27,7 @@
-
+
{{ i?.enterpriseProjectName }} {{ i?.deadlineTime }} {{ i?.createUserName }}/{{ i?.createUserPhone }} @@ -36,7 +36,35 @@
- + +
+ +

货源编码 : {{ i?.resourceCode }}

+
+
+
网络货运人：{{ i?.shipperAppUserName }}
+
+ + + +
+
+
+
+ 总费用：{{ i?.totalAmount | currency: '¥' }} +
+
+ +
+ {{ i?.enterpriseProjectName }} + {{ i?.deadlineTime }} + {{ i?.createUserName }}/{{ i?.createUserPhone }} + {{ i?.dispatchName }}/{{ i?.dispatchPhone }} + {{ i?.serviceTypeLabel }} +
@@ -51,33 +79,6 @@
- - - - - 货物信息 - - - {{item.goodsTypeName}} > {{item.goodsName}} - - - {{item.weight}}吨 / {{item.volume>=0?item.volume:'-'}}方 - - - {{i?.surplusWeight!==null?i?.surplusWeight:'--'}}吨 / {{i?.surplusVolume!==null?i?.surplusVolume:'-'}}方 - - - {{item.carModelLabel || '--'}} / {{item.carLengthLabel || '--'}}米 - - - - -

装货卸货信息 ( @@ -119,7 +120,39 @@

- + +
+ + 基本信息 +
+ + + + + {{item.goodsTypeName}} > {{item.goodsName}} + + + {{item.weight}}吨 / {{item.volume>=0?item.volume:'-'}}方 + + + {{i?.surplusWeight!==null?i?.surplusWeight:'--'}}吨 / {{i?.surplusVolume!==null?i?.surplusVolume:'-'}}方 + + + {{item.carModelLabel || '--'}} / {{item.carLengthLabel || '--'}}米 + + + + + + + + +
@@ -132,13 +165,13 @@ {{ item?.freightPrice | currency: '￥' }} {{ freightType[item?.freightType] }} - （附加费率{{i?.rate * 100 | number: '0.2-2'}}%） + （附加费率{{i?.rate * 100 | number: '0.2-2'}}%）
- + ({{ item?.count }}) @@ -157,7 +190,7 @@ --> - + {{ i?.supplementaryInformationVO?.stateReceipt ? '是' : '否' }} @@ -166,7 +199,8 @@ {{ i?.supplementaryInformationVO?.receiptTypeLabel }} - {{ i?.supplementaryInformationVO?.receiptUserName ? i?.supplementaryInformationVO?.receiptUserName + '/' : '' }} {{ i?.supplementaryInformationVO?.phon }} + {{ i?.supplementaryInformationVO?.receiptUserName ? i?.supplementaryInformationVO?.receiptUserName + '/' : '' }} + {{ i?.supplementaryInformationVO?.phon }} {{ i?.supplementaryInformationVO?.area }} @@ -174,14 +208,13 @@ {{ i?.supplementaryInformationVO?.address }} - + {{ i?.supplementaryInformationVO?.remarks }} - - + diff --git a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.less b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.less index 957a1f03..df21f696 100644 --- a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.less +++ b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.less @@ -3,7 +3,7 @@ min-height: 210px; p { - margin-bottom: .5em; + margin-bottom: 0; } } diff --git a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html index a570a0d1..bcb7cb4a 100644 --- a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html @@ -1,11 +1,46 @@ -
- - - - - + +
+ + + + + +
+ +

货源编码 : {{ i?.resourceCode }}

+
+
+
网络货运人：{{ i?.enterpriseInfoName }}
+
+ + + + +
+
+
+
+ 总费用：{{ i?.totalAmount | currency }} +
+
+ +
+ {{ i?.externalResourceCode }} + {{ i?.enterpriseProjectName }} + {{ i?.createUserName }}/{{ i?.createUserPhone }} + {{ i?.dispatchName }}/{{ i?.dispatchPhone }} + {{ i?.serviceTypeLabel }} +
+ + +

货源编码 : {{ i?.resourceCode }}

@@ -13,218 +48,214 @@
网络货运人：{{ i?.enterpriseInfoName }}
- - - - + + + +
-
+ + +
{{ i?.externalResourceCode }} {{ i?.enterpriseProjectName }} {{ i?.createUserName }}/{{ i?.createUserPhone }} {{ i?.dispatchName }}/{{ i?.dispatchPhone }} {{ i?.serviceTypeLabel }}
- - - -
-
- - - - - +
+
+ + + + + +
-
- + - - - 货物信息 - - - {{ item.goodsTypeName }} - {{ item.goodsName }} + +
+ + 基本信息 +
+ + + + + {{ item.goodsTypeName }} - {{ item.goodsName }} + + {{ item.weight }}吨,{{ item.volume }}方,{{ item.number }}件 + + + + + + {{ i?.carrierInformationVO?.driverName }} - {{ item.weight }}吨,{{ item.volume }}方,{{ item.number }}件 - - - - 承运信息 - - {{ i?.carrierInformationVO?.driverName }} + + {{ i?.carrierInformationVO?.driverTelephone }} + + + {{ i?.carrierInformationVO?.driverLicensePlate }} + + + + {{i?.carrierInformationVO.driverName || '--'}} / {{i?.carrierInformationVO.driverTelephone || '--'}} / + {{i?.carrierInformationVO.driverLicensePlate || '--'}} - - {{ i?.carrierInformationVO?.driverTelephone }} + + {{i?.driverCarModelLabel || '--'}} / {{(i?.driverCarLength || '--') +'米'}} / {{(i?.driverCarWeight || + '--')+'吨'}} - - {{ i?.carrierInformationVO?.driverLicensePlate }} - - -
-

装货卸货信息 - ( - - - ) - -

-
-
-
-
-
-
装
-
-

装货地：{{ item?.province }}{{ item?.city }}{{ item?.area }}{{ item?.detailedAddress }}

-

联系人：{{ item?.appUserName }}/{{ item?.contractTelephone }}

-
-
-
-

装货时间：{{ i?.loadingTime }}

-
-
-
-
-
-
-
卸
-
-

卸货地：{{ item?.province }}{{ item?.city }}{{ item?.area }}{{ item?.detailedAddress }}

-

联系人：{{ item?.appUserName }}/{{ item?.contractTelephone }}

-
-
-
-

卸货时间：{{ i?.unloadingTime }}

-
-
-
-
- - - - - - {{ i?.insuranceTypeLabel}} - - - {{i?.goodsValue !==null?(i?.goodsValue|currency)+'元':'-'}} - - - {{i?.insurancePremium!==null?(i?.insurancePremium |currency)+'元':'-'}} - - - - - - -
- {{ item?.totalAmount | currency }} - (含附加费） -
- - -
- {{ item?.price | currency }} -
- - -
-
-

- - - {{ i?.totalAmount | currency }} +
+

装货卸货信息 + ( + + + ) - （运费{{ i?.totalFreight | currency }}含附加运费 {{ i?.totalSurcharge | currency }}） -

-
车队长：{{ i?.payeeName }}/{{ i?.payeePhone }}/{{ i?.payeeCardNo }}
+

+
+
+
+ +
+
+
装
+
+

装货地：{{ item?.province }}{{ item?.city }}{{ item?.area }}{{ item?.detailedAddress }}

+

联系人：{{ item?.appUserName }}/{{ item?.contractTelephone }}

+
+
+
+ +

装货时间：{{ i?.loadingTime }}

+
+
+
+
+ +
+
+
卸
+
+

卸货地：{{ item?.province }}{{ item?.city }}{{ item?.area }}{{ item?.detailedAddress }}

+

联系人：{{ item?.appUserName }}/{{ item?.contractTelephone }}

+
+
+
+ +

卸货时间：{{ i?.unloadingTime }}

+
+
+
-
- - - - - {{ i?.supplementaryInformationVO?.stateReceipt ? '是' : '否' }} - - - {{ i?.supplementaryInformationVO?.receiptType === '1' ? '电子回单' : '纸质回单' }} - - {{ i?.supplementaryInformationVO?.receiptUserName || '-' }} / {{ i?.supplementaryInformationVO?.phon || '-' }} - - - {{ i?.supplementaryInformationVO?.area }} - - - {{ i?.supplementaryInformationVO?.address }} - - - {{ i?.supplementaryInformationVO?.remarks }} - - - - - - -
- {{ item?.operator }} {{ item?.telephone ? '/' + item?.telephone : '' }} + + + +
+ + 服务信息
- - - -
+ + + {{ i?.insuranceTypeLabel}} + + + {{i?.goodsValue !==null?(i?.goodsValue|currency)+'元':'-'}} + + + {{i?.insurancePremium!==null?(i?.insurancePremium |currency)+'元':'-'}} + + + + +
+ + 运费信息 + (到货后{{i?.paymentDays}}天内支付运费) +
+ + +
+ {{ item?.totalAmount | currency }} + (含附加费） +
+ + +
+ {{ item?.price | currency }} +
+ + +
+
+

+ + + {{ i?.totalAmount | currency }} + + （运费{{ i?.totalFreight | currency }}含附加运费 {{ i?.totalSurcharge | currency }}） +

+
车队长：{{ + i?.payeeName }}/{{ i?.payeePhone }}/{{ i?.payeeCardNo }}
+
+
+ + +
+ + 补充信息 +
+ + + {{ i?.supplementaryInformationVO?.stateReceipt ? '是' : '否' }} + + + {{ i?.supplementaryInformationVO?.receiptType === '1' ? '电子回单' : '纸质回单' }} + + {{ + i?.supplementaryInformationVO?.receiptUserName || '-' }} / {{ i?.supplementaryInformationVO?.phon || '-' }} + + + {{ i?.supplementaryInformationVO?.area }} + + + {{ i?.supplementaryInformationVO?.address }} + + + {{ i?.supplementaryInformationVO?.remarks }} + + + + +
+ + 操作日志 +
+ + +
+ {{ item?.operator }} {{ item?.telephone ? '/' + item?.telephone : '' }} +
+ + + +
+ diff --git a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.less b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.less index e963d1b7..172f5525 100644 --- a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.less +++ b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.less @@ -3,7 +3,7 @@ min-height: 210px; p { - margin-bottom: .5em; + margin-bottom: 5px; } } diff --git a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts index fc07ab75..67b57200 100644 --- a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts +++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts @@ -440,12 +440,15 @@ export class TaxManagementOrderReportingComponent implements OnInit { if (item?.putStatus != '0') { status = true } - }); if(status) { this.service.msgSrv.warning('选择了已上传，请重新勾选！'); return; } + if(this.selectedRows.find(item => item.checkStatus !== '1')) { + this.service.msgSrv.warning('选择了未通过校验的订单，请重新勾选！'); + return; + } let params: any[] = []; this.selectedRows.forEach(item => { params.push(item.id); diff --git a/src/styles.less b/src/styles.less index c40ad1c0..527089dc 100644 --- a/src/styles.less +++ b/src/styles.less @@ -2,16 +2,17 @@ @import '~@delon/abc/index'; @import '~@delon/chart/index'; @import 'app/layout/pro/styles/index.less'; +@import './styles/common/global.less'; @import './styles/index'; @import './styles/theme'; .icon { - width : 18px; - fill : currentColor; - overflow : hidden; - font-size : 18px !important; - color : #ffffff; + width: 18px; + fill: currentColor; + overflow: hidden; + font-size: 18px !important; + color: #ffffff; margin-right: 10px; } @@ -19,13 +20,13 @@ /* 全局滚动条美化 */ *::-webkit-scrollbar { - width : (@layout-gutter); + width: (@layout-gutter); height: (@layout-gutter); } *::-webkit-scrollbar-thumb { - background : #d9d9d9; - cursor : pointer; + background: #d9d9d9; + cursor: pointer; border-radius: (@layout-gutter) / 2; } @@ -46,14 +47,14 @@ input[type="number"] { .break-word-all { word-break: break-all; - word-wrap : break-word; + word-wrap: break-word; } st { .block-td { .ant-divider-vertical { - display : none; - margin : 0; + display: none; + margin: 0; border-left: none; } @@ -66,9 +67,9 @@ st { } nz-range-picker { - width : 100%; + width: 100%; word-break: break-all; - word-wrap : break-word; + word-wrap: break-word; } .ant-select-tree .ant-select-tree-treenode-disabled { @@ -76,13 +77,13 @@ nz-range-picker { margin: 0; .ant-select-tree-checkbox-inner { - width : 0px; + width: 0px; border-color: #ffffff !important; } } .ant-select-tree-node-content-wrapper { - color : unset; + color: unset; cursor: not-allowed; } } @@ -93,13 +94,13 @@ nz-range-picker { margin: 0; .ant-select-tree-checkbox-inner { - width : 0px; + width: 0px; border-color: #ffffff !important; } } .ant-select-tree-node-content-wrapper { - color : unset; + color: unset; cursor: not-allowed; } } @@ -109,4 +110,4 @@ nz-range-picker { cdk-virtual-scroll-viewport { min-height: 54px; } -} \ No newline at end of file +} diff --git a/src/styles/common/global.less b/src/styles/common/global.less new file mode 100644 index 00000000..1c9488df --- /dev/null +++ b/src/styles/common/global.less @@ -0,0 +1,60 @@ +.detail-title { + display: flex; + align-items: center; + margin-bottom: 12px; + + + .sign { + width: 2px; + height: 16px; + background: #E60012; + display: inline-block; + margin-right: 10px; + } +} + +.divider-margin { + margin-top: 12px; + margin-bottom: 12px; +} + +.step-row { + width: 80%; + margin: 0 auto; + + .ant-steps-item-description { + font-size: 12px; + } +} + +.new-sv-container { + &.sv__horizontal { + .sv__label-width { + justify-content: left; + } + } +} + +.new-sf-container { + &.sf__horizontal .ant-form-item-label>label { + justify-content: left; + } +} + +.common-order-header { + display: flex; + justify-content: space-between; +} + +.common-grey { + color: #8A8E99; +} + +.nameBox { + display: flex; + align-items: baseline; + + .name { + margin: 0 10px 10px 0; + } +} diff --git a/src/styles/index.less b/src/styles/index.less index 7b1e6a6f..671364f1 100644 --- a/src/styles/index.less +++ b/src/styles/index.less @@ -1,9 +1,11 @@ /* You can add global styles to this file, and also import other style files */ @import './fix/index'; + + .error-color { - color: #ff4d4f; + color: #ff4d4f; } @primary-color: #F5222D; -@font-size-base: 15px; \ No newline at end of file +@font-size-base: 15px; diff --git a/src/styles/theme.less b/src/styles/theme.less index f5667bf2..1082d2fa 100644 --- a/src/styles/theme.less +++ b/src/styles/theme.less @@ -5,6 +5,7 @@ @import '../app/layout/pro/styles/theme-default.less'; @import './fix/theme-default.less'; + // ==========Custom brand visual color========== // ==========Custom brand visual color========== @@ -22,4 +23,4 @@ .ant-btn { border-radius: 4px; -} \ No newline at end of file +}