canrd-main / canrd-erp-front · Commits

Commit c35d1eb525d695e525081913daf79c738ba90f0d

Authored by boyang
1 parent d1027ece
build: skipped

fix: 预警数量

Inline Side-by-side
Showing 1 changed file with 48 additions and 48 deletions
src/pages/Order/OrderWarning/index.tsx
  View file @c35d1eb
... ... @@ -789,7 +789,7 @@ const OrderPage = () => {
789 789 onConfirm={() => {
790 790 window.open(
791 791 '/previewApi/onlinePreview?url=' +
792   - encodeURIComponent(Base64.encode(item.url)),
  792 + encodeURIComponent(Base64.encode(item.url)),
793 793 );
794 794 }}
795 795 onCancel={() => {
... ... @@ -861,7 +861,7 @@ const OrderPage = () => {
861 861 </span>
862 862 {(roleCode === 'salesRepresentative' ||
863 863 roleCode === 'salesManager') &&
864   - !optRecord.isCurrentUserOrder ? (
  864 + !optRecord.isCurrentUserOrder ? (
865 865 <span className="text-[#f44e4e]">(非本账号订单)</span>
866 866 ) : (
867 867 ''
... ... @@ -1045,13 +1045,13 @@ const OrderPage = () =&gt; {
1045 1045 <Tooltip
1046 1046 title={
1047 1047 optRecord.invoicingUrgentCause !== null &&
1048   - optRecord.afterInvoicingStatus ===
  1048 + optRecord.afterInvoicingStatus ===
1049 1049 'URGENT_INVOICE_AUDITING'
1050 1050 ? optRecord.invoicingUrgentCause
1051 1051 : enumValueToLabel(
1052   - optRecord.afterInvoicingStatus,
1053   - AFTER_INVOICING_STATUS,
1054   - )
  1052 + optRecord.afterInvoicingStatus,
  1053 + AFTER_INVOICING_STATUS,
  1054 + )
1055 1055 }
1056 1056 >
1057 1057 <Tag
... ... @@ -1082,7 +1082,7 @@ const OrderPage = () =&gt; {
1082 1082 )}
1083 1083  
1084 1084 {(roleCode === 'warehouseKeeper' || roleCode === 'admin') &&
1085   - optRecord.shippingWarehouse !== null ? (
  1085 + optRecord.shippingWarehouse !== null ? (
1086 1086 <div
1087 1087 className="overflow-hidden whitespace-no-wrap overflow-ellipsis"
1088 1088 title={enumValueToLabel(
... ... @@ -1104,7 +1104,7 @@ const OrderPage = () =&gt; {
1104 1104 {/* 生产时间 */}
1105 1105 <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
1106 1106 {optRecord.productionStartTime !== null ||
1107   - optRecord.productionEndTime !== null ? (
  1107 + optRecord.productionEndTime !== null ? (
1108 1108 <MyToolTip
1109 1109 title={
1110 1110 formatdate(optRecord.productionStartTime) +
... ... @@ -1134,7 +1134,7 @@ const OrderPage = () =&gt; {
1134 1134 <Tag
1135 1135 color={
1136 1136 optRecord.invoicingTime === null ||
1137   - optRecord.invoicingTime === undefined
  1137 + optRecord.invoicingTime === undefined
1138 1138 ? TAGS_COLOR.get(optRecord.invoicingStatus)
1139 1139 : 'success'
1140 1140 }
... ... @@ -1162,7 +1162,7 @@ const OrderPage = () =&gt; {
1162 1162  
1163 1163 {/**采购是否已下单状态 */}
1164 1164 {optRecord.procureOrderStatus !== null &&
1165   - optRecord.procureOrderStatus !== undefined ? (
  1165 + optRecord.procureOrderStatus !== undefined ? (
1166 1166 <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
1167 1167 <Tag color="success">
1168 1168 {enumValueToLabel(
... ... @@ -1178,21 +1178,21 @@ const OrderPage = () =&gt; {
1178 1178 {/* 物流信息 */}
1179 1179 <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
1180 1180 {optRecord.orderStatus === 'CONFIRM_RECEIPT' ||
1181   - optRecord.orderStatus === 'AFTER_SALES_COMPLETION' ||
1182   - optRecord.orderStatus === 'IN_AFTER_SALES' ||
1183   - optRecord.orderStatus === 'SHIPPED' ? (
  1181 + optRecord.orderStatus === 'AFTER_SALES_COMPLETION' ||
  1182 + optRecord.orderStatus === 'IN_AFTER_SALES' ||
  1183 + optRecord.orderStatus === 'SHIPPED' ? (
1184 1184 <MyToolTip
1185 1185 title={
1186 1186 optRecord.serialNumber === undefined
1187 1187 ? '暂无物流信息'
1188 1188 : enumValueToLabel(
1189   - optRecord.logisticsMethod,
1190   - LOGISTICS_STATUS_OPTIONS,
1191   - ) +
1192   - ' ' +
1193   - optRecord.serialNumber +
1194   - ' ' +
1195   - optRecord.logisticsNotes
  1189 + optRecord.logisticsMethod,
  1190 + LOGISTICS_STATUS_OPTIONS,
  1191 + ) +
  1192 + ' ' +
  1193 + optRecord.serialNumber +
  1194 + ' ' +
  1195 + optRecord.logisticsNotes
1196 1196 }
1197 1197 content={
1198 1198 <Button type="link" size="small" style={{ padding: 0 }}>
... ... @@ -1206,7 +1206,7 @@ const OrderPage = () =&gt; {
1206 1206  
1207 1207 {/* 修改审核状态 */}
1208 1208 {optRecord.modifiedAuditStatus !== null &&
1209   - optRecord.modifiedAuditStatus !== 'AUDIT_FAILURE' ? (
  1209 + optRecord.modifiedAuditStatus !== 'AUDIT_FAILURE' ? (
1210 1210 <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
1211 1211 <Tooltip
1212 1212 title={recordOptNode ? recordOptNode : <Spin />}
... ... @@ -1646,7 +1646,7 @@ const OrderPage = () =&gt; {
1646 1646 )}
1647 1647  
1648 1648 {optRecord.paths?.includes('queryAnnex') &&
1649   - optRecord.listAnnex?.length > 0 ? (
  1649 + optRecord.listAnnex?.length > 0 ? (
1650 1650 <Button
1651 1651 className="p-0"
1652 1652 type="link"
... ... @@ -2113,7 +2113,7 @@ const OrderPage = () =&gt; {
2113 2113 </Flex>
2114 2114  
2115 2115 {(isProcure() || isWarehousekeeper() || isSales() || isAdmin()) &&
2116   - !isSupplier() ? (
  2116 + !isSupplier() ? (
2117 2117 <div className="pt-2">
2118 2118 <Flex title={optRecord.supplierName}>
2119 2119 <div>
... ... @@ -2188,7 +2188,7 @@ const OrderPage = () =&gt; {
2188 2188 <span className="text-[#8C8C8C]">
2189 2189 申请开票备注：
2190 2190 {optRecord.applyInvoicingNotes === undefined ||
2191   - optRecord.applyInvoicingNotes === null
  2191 + optRecord.applyInvoicingNotes === null
2192 2192 ? '暂无备注'
2193 2193 : optRecord.applyInvoicingNotes}
2194 2194 </span>
... ... @@ -2216,7 +2216,7 @@ const OrderPage = () =&gt; {
2216 2216 <span className="text-[#8C8C8C] mr-3">
2217 2217 财务审核备注：
2218 2218 {optRecord.checkNotes === undefined ||
2219   - optRecord.checkNotes === null
  2219 + optRecord.checkNotes === null
2220 2220 ? '暂无备注'
2221 2221 : optRecord.checkNotes}
2222 2222 </span>
... ... @@ -2240,7 +2240,7 @@ const OrderPage = () =&gt; {
2240 2240 <span className="text-[#8C8C8C]">
2241 2241 重新开票备注：
2242 2242 {optRecord.reissueNotes === undefined ||
2243   - optRecord.reissueNotes === null
  2243 + optRecord.reissueNotes === null
2244 2244 ? '暂无备注'
2245 2245 : optRecord.reissueNotes}
2246 2246 </span>
... ... @@ -2277,7 +2277,7 @@ const OrderPage = () =&gt; {
2277 2277 <span className="text-[#8C8C8C] mr-3">
2278 2278 产品回访登记：
2279 2279 {optRecord.feedbackRegistrationContent === undefined ||
2280   - optRecord.feedbackRegistrationContent === null
  2280 + optRecord.feedbackRegistrationContent === null
2281 2281 ? '暂无'
2282 2282 : optRecord.feedbackRegistrationContent}
2283 2283 </span>
... ... @@ -2568,9 +2568,9 @@ const OrderPage = () =&gt; {
2568 2568 <span className="text-slate-700">
2569 2569 {record.receivingCompany !== null
2570 2570 ? enumValueToLabel(
2571   - record.receivingCompany,
2572   - getReceivingCompanyOptions(PAYEE_OPTIONS),
2573   - )
  2571 + record.receivingCompany,
  2572 + getReceivingCompanyOptions(PAYEE_OPTIONS),
  2573 + )
2574 2574 : '暂无'}
2575 2575 </span>
2576 2576 </div>
... ... @@ -3362,9 +3362,9 @@ const OrderPage = () =&gt; {
3362 3362 for (let i = 0; i < selectedSubOrders.length; i++) {
3363 3363 if (
3364 3364 selectedSubOrders[i].invoicingStatus ===
3365   - 'UN_INVOICE' ||
  3365 + 'UN_INVOICE' ||
3366 3366 selectedSubOrders[i].afterInvoicingStatus ===
3367   - 'APPLY_FOR_INVOICING'
  3367 + 'APPLY_FOR_INVOICING'
3368 3368 ) {
3369 3369 message.error(
3370 3370 '请选择需要开票且未申请开票的子订单进行申请',
... ... @@ -3399,9 +3399,9 @@ const OrderPage = () =&gt; {
3399 3399 for (let i = 0; i < selectedSubOrders.length; i++) {
3400 3400 if (
3401 3401 selectedSubOrders[i].invoicingStatus ===
3402   - 'UN_INVOICE' ||
  3402 + 'UN_INVOICE' ||
3403 3403 selectedSubOrders[i].afterInvoicingStatus ===
3404   - 'APPLY_FOR_INVOICING'
  3404 + 'APPLY_FOR_INVOICING'
3405 3405 ) {
3406 3406 message.error(
3407 3407 '请选择需要开票且未申请开票的子订单进行申请',
... ... @@ -3615,13 +3615,13 @@ const OrderPage = () =&gt; {
3615 3615 if (
3616 3616 selectedSubOrders[i].orderStatus !== 'AUDITED' &&
3617 3617 selectedSubOrders[i].orderStatus !==
3618   - 'PROCURE_PROCESS' &&
  3618 + 'PROCURE_PROCESS' &&
3619 3619 selectedSubOrders[i].orderStatus !==
3620   - 'PROCURE_PROCESS_FOR_MINE' &&
  3620 + 'PROCURE_PROCESS_FOR_MINE' &&
3621 3621 selectedSubOrders[i].orderStatus !==
3622   - 'PROCURE_WAIT_SHIP' &&
  3622 + 'PROCURE_WAIT_SHIP' &&
3623 3623 selectedSubOrders[i].orderStatus !==
3624   - 'SUPPLIER_WAIT_SHIP' &&
  3624 + 'SUPPLIER_WAIT_SHIP' &&
3625 3625 selectedSubOrders[i].orderStatus !== 'WAIT_SHIP'
3626 3626 ) {
3627 3627 message.error(
... ... @@ -3707,9 +3707,9 @@ const OrderPage = () =&gt; {
3707 3707 if (
3708 3708 selectedSubOrders[i].orderStatus !== 'UNAUDITED' &&
3709 3709 selectedSubOrders[i].orderStatus !==
3710   - 'FINANCE_PROCESS' &&
  3710 + 'FINANCE_PROCESS' &&
3711 3711 selectedSubOrders[i].orderStatus !==
3712   - 'LEADER_AUDITED'
  3712 + 'LEADER_AUDITED'
3713 3713 ) {
3714 3714 message.error(
3715 3715 '请选择[未审核]、[财务待审核]、[领导已审核]的子订单进行审核',
... ... @@ -3777,9 +3777,9 @@ const OrderPage = () =&gt; {
3777 3777 for (let i = 0; i < selectedSubOrders.length; i++) {
3778 3778 if (
3779 3779 selectedSubOrders[i].orderStatus !==
3780   - 'CONFIRM_RECEIPT' &&
  3780 + 'CONFIRM_RECEIPT' &&
3781 3781 selectedSubOrders[i].orderStatus !==
3782   - 'AFTER_SALES_FAILURE'
  3782 + 'AFTER_SALES_FAILURE'
3783 3783 ) {
3784 3784 message.error('请选择确认收货状态的子订单进行售后');
3785 3785 return;
... ... @@ -4226,7 +4226,7 @@ const OrderPage = () =&gt; {
4226 4226 label: (
4227 4227 <span>
4228 4228 确认收货预警
4229   - <Badge count={waitConfirmPayment} style={{ marginLeft: 8 }} />
  4229 + <Badge count={invoiceRefundWarningNum} style={{ marginLeft: 8 }} />
4230 4230 </span>
4231 4231 ),
4232 4232 },
... ... @@ -4253,7 +4253,7 @@ const OrderPage = () =&gt; {
4253 4253 label: (
4254 4254 <span>
4255 4255 订单回款预警
4256   - <Badge count={invoiceRefundWarningNum} style={{ marginLeft: 8 }} />
  4256 + <Badge count={waitConfirmPayment} style={{ marginLeft: 8 }} />
4257 4257 </span>
4258 4258 ),
4259 4259 },
... ... @@ -4278,7 +4278,7 @@ const OrderPage = () =&gt; {
4278 4278 <Radio.Group
4279 4279 value={value1}
4280 4280 onChange={radioOnChange1}
4281   - // 通过 onClick 处理单独 Radio 的点击事件
  4281 + // 通过 onClick 处理单独 Radio 的点击事件
4282 4282 >
4283 4283 {(activeTabKey === 1
4284 4284 ? options1
... ... @@ -4492,9 +4492,9 @@ const OrderPage = () =&gt; {
4492 4492 toolbar={{
4493 4493 multipleLine: true,
4494 4494 }}
4495   - // toolBarRender={() => {
4496   - // return toolBarRender();
4497   - // }}
  4495 + // toolBarRender={() => {
  4496 + // return toolBarRender();
  4497 + // }}
4498 4498 />
4499 4499  
4500 4500 {orderDrawerVisible && (
... ...