chore: 修改状态颜色

src/pages/afterService/constants.ts

@@ -122,7 +122,7 @@ export const REPAIR_OUTER_STATUS_TAG_MAP = {
 
 // 售后维修内部部状态 Badge map
 export const REPAIR_INNER_STATUS_BADGE_MAP = {
-  [REPAIR_INNER_STATUS_UNCOMMITTED]: '#669EDE', 
+  [REPAIR_INNER_STATUS_UNCOMMITTED]: '#EBECF0', 
   [REPAIR_INNER_STATUS_COMMIT_SUCCESS]: '#41CC9E', 
   [REPAIR_INNER_STATUS_SUCCESS_1]: '#41CC9E', 
   [REPAIR_INNER_STATUS_SUCCESS_2]: '#41CC9E', 
@@ -141,16 +141,16 @@ export const EXCHANGE_OUTER_STATUS_TAG_MAP = {
   [EXCHANGE_OUTER_STATUS_FAILED]: 'danger', 
   [EXCHANGE_OUTER_STATUS_SUCCESS]: 'primary', 
   [EXCHANGE_OUTER_STATUS_NOT_ADDED_RETURN_DELIVERY]: 'danger', 
-  [EXCHANGE_OUTER_STATUS_CONSUMER_NOT_ADDED_LOGISTICS]: 'warning', 
+  [EXCHANGE_OUTER_STATUS_CONSUMER_NOT_ADDED_LOGISTICS]: 'danger', 
   [EXCHANGE_OUTER_STATUS_RETURN_DELIVERY]: 'danger', 
   [EXCHANGE_OUTER_STATUS_NOT_ADDED_RETURN_STORAGE]: 'danger', 
   [EXCHANGE_OUTER_STATUS_RETURN_RECEIVE]: 'danger', 
-  [EXCHANGE_OUTER_STATUS_UNCONFIRMED_RETURN_RECEIPT]: 'danger', 
-  [EXCHANGE_OUTER_STATUS_NOT_ADDED_REPLACE_DELIVERY]: 'nobility', 
-  [EXCHANGE_OUTER_STATUS_SUPPLIER_NOT_ADDED_LOGISTICS]: 'success', 
-  [EXCHANGE_OUTER_STATUS_REPLACE_DELIVERY]: 'nobility', 
-  [EXCHANGE_OUTER_STATUS_NOT_ADDED_REPLACE_STORAGE]: 'nobility', 
-  [EXCHANGE_OUTER_STATUS_REPLACE_RECEIVE]: 'nobility', 
+  [EXCHANGE_OUTER_STATUS_UNCONFIRMED_RETURN_RECEIPT]: 'primary', 
+  [EXCHANGE_OUTER_STATUS_NOT_ADDED_REPLACE_DELIVERY]: 'danger', 
+  [EXCHANGE_OUTER_STATUS_SUPPLIER_NOT_ADDED_LOGISTICS]: 'danger', 
+  [EXCHANGE_OUTER_STATUS_REPLACE_DELIVERY]: 'danger', 
+  [EXCHANGE_OUTER_STATUS_NOT_ADDED_REPLACE_STORAGE]: 'danger', 
+  [EXCHANGE_OUTER_STATUS_REPLACE_RECEIVE]: 'danger', 
   [EXCHANGE_OUTER_STATUS_UNCONFIRMED_REPLACE_RECEIPT]: 'primary', 
   [EXCHANGE_OUTER_STATUS_UNCONFIRMED_FINISHED]: 'primary', 
   [EXCHANGE_OUTER_STATUS_FINISHED]: 'success', 
@@ -158,7 +158,7 @@ export const EXCHANGE_OUTER_STATUS_TAG_MAP = {
 
 // 售后换货内部状态 Badge map
 export const EXCHANGE_INNER_STATUS_BADGE_MAP = {
-  [EXCHANGE_INNER_STATUS_UNCOMMITTED]: '#669EDE', 
+  [EXCHANGE_INNER_STATUS_UNCOMMITTED]: '#EBECF0', 
   [EXCHANGE_INNER_STATUS_COMMIT_SUCCESS]: '#41CC9E', 
   [EXCHANGE_INNER_STATUS_SUCCESS_1]: '#41CC9E', 
   [EXCHANGE_INNER_STATUS_SUCCESS_2]: '#41CC9E', 
@@ -215,13 +215,13 @@ export const RETURN_OUTER_STATUS_TAG_MAP = {
   [RETURN_OUTER_STATUS_UNCOMMITTED]: 'default', 
   [RETURN_OUTER_UNCONFIRMED]: 'primary', 
   [RETURN_OUTER_STATUS_FAILED]: 'danger', 
-  [RETURN_OUTER_STATUS_SUCCESS]: 'primary', 
+  [RETURN_OUTER_STATUS_SUCCESS]: 'success', 
   [RETURN_OUTER_STATUS_NOT_ADDED_RETURN_DELIVERY]: 'danger', 
-  [RETURN_OUTER_STATUS_CONSUMER_NOT_ADDED_LOGISTICS]: 'warning', 
+  [RETURN_OUTER_STATUS_CONSUMER_NOT_ADDED_LOGISTICS]: 'danger', 
   [RETURN_OUTER_STATUS_RETURN_DELIVERY]: 'danger', 
   [RETURN_OUTER_STATUS_NOT_ADDED_RETURN_STORAGE]: 'danger', 
   [RETURN_OUTER_STATUS_RETURN_RECEIVE]: 'danger', 
-  [RETURN_OUTER_STATUS_UNCONFIRMED_RETURN_RECEIPT]: 'danger', 
+  [RETURN_OUTER_STATUS_UNCONFIRMED_RETURN_RECEIPT]: 'primary', 
   [RETURN_OUTER_STATUS_TO_BE_REFUNDED]: 'danger', 
   [RETURN_OUTER_STATUS_UNCONFIRMED_REFUNDED]: 'primary', 
   [RETURN_OUTER_STATUS_NOT_RECEIVED]: 'warning', 
@@ -231,17 +231,17 @@ export const RETURN_OUTER_STATUS_TAG_MAP = {
 
 // 售后退货内部状态 Badge map
 export const RETURN_INNER_STATUS_BADGE_MAP = {
-  [RETURN_INNER_STATUS_UNCOMMITTED]: '#669EDE', 
+  [RETURN_INNER_STATUS_UNCOMMITTED]: '#EBECF0', 
   [RETURN_INNER_STATUS_COMMIT_SUCCESS]: '#41CC9E', 
-  [RETURN_INNER_STATUS_SUCCESS_1]: '#41CC9E', 
-  [RETURN_INNER_STATUS_SUCCESS_2]: '#41CC9E', 
+  [RETURN_INNER_STATUS_SUCCESS_1]: '#669EDE', 
+  [RETURN_INNER_STATUS_SUCCESS_2]: '#669EDE', 
   [RETURN_INNER_STATUS_FAILED_2]: '#EF6260', 
   [RETURN_INNER_STATUS_CONFIRM_SUCCESS]: '#41CC9E', 
   [RETURN_INNER_STATUS_CONFIRM_FAILED]: '#EF6260', 
-  [RETURN_INNER_STATUS_NOT_ADDED_RETURN_DELIVERY]: '#E63F3B', 
+  [RETURN_INNER_STATUS_NOT_ADDED_RETURN_DELIVERY]: '#EF6260', 
   [RETURN_INNER_STATUS_UNREVIEWED_RETURN_DELIVERY]: '#FF991F', 
-  [RETURN_INNER_STATUS_CONSUMER_NOT_ADDED_LOGISTICS]: '#E63F3B', 
-  [RETURN_INNER_STATUS_CONSUMER_UNCONFIRMED_LOGISTICS]: '#6C9CEB', 
+  [RETURN_INNER_STATUS_CONSUMER_NOT_ADDED_LOGISTICS]: '#EF6260', 
+  [RETURN_INNER_STATUS_CONSUMER_UNCONFIRMED_LOGISTICS]: '#FF991F', 
   [RETURN_INNER_STATUS_UNCONFIRMED_RETURN_DELIVERY]: '#6C9CEB', 
   [RETURN_INNER_STATUS_NOT_ADDED_RETURN_STORAGE]: '#E63F3B', 
   [RETURN_INNER_STATUS_UNREVIEWED_RETURN_STORAGE]: '#FF991F', 

src/pages/transaction/stockSellStorage/bills/components/BillsForm/effects/useBusinessEffects.ts

@@ -2,7 +2,7 @@
  * @Author: XieZhiXiong
  * @Date: 2020-09-16 15:16:47
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2021-03-02 14:30:30
+ * @LastEditTime: 2021-03-19 15:34:43
  * @Description: 联动逻辑相关
  */
 import { Modal, message } from 'antd';
@@ -539,7 +539,7 @@ export const useBusinessEffects = (context, actions) => {
     // 这里判断是否货品 跟 商品 都已经选择过了，不可重复选择
     const sameGood = invoicesDetailsRequestsValue.find((item, index) => index !== +itemIndex && item.itemNo === itemNoValue && item.product === value);
     if (sameGood) {
-      message.warning('存在相同货号+商品的组合，请重新选择');
+      message.warning('存在相同货品+商品的组合，请重新选择');
       setTimeout(() => {
         setFieldState(
           FormPath.transform(name, /\d/, $1 => {

src/pages/transaction/stockSellStorage/bills/components/BillsForm/index.tsx

@@ -69,7 +69,7 @@ interface BillsFormProps {
    */
   relevanceInvoices: string;
   /**
-   * 单据id，可能是待新增销售发货单，待新增采购入库单跳转过来的
+   * 对应的单据id，用于查询必要的数据所需
    */
   relevanceInvoicesId: string;
   /**