feat(Order): 增加官网订单支付状态变更提示

- 在订单抽屉中添加关于官网订单支付状态的提示信息 - 当订单状态从已付款改为其他状态时，提示用户这将影响财务模块的自动核销 - 当订单状态改为已付款时，提示用户该订单将在财务模块中自动核销 - 优化了支付方式选择框的显示逻辑

feat(Order): 增加官网订单支付状态变更提示
- 在订单抽屉中添加关于官网订单支付状态的提示信息 - 当订单状态从已付款改为其他状态时，提示用户这将影响财务模块的自动核销 - 当订单状态改为已付款时，提示用户该订单将在财务模块中自动核销 - 优化了支付方式选择框的显示逻辑
曾国涛
1 parent b9d8e000
Showing 3 changed files with 29 additions and 5 deletions
src/pages/Order/Order/components/OrderDrawer.tsx
src/pages/Order/Order/index.tsx
src/pages/Order/OrderWarning/components/OrderDrawer.tsx
@@ -28,6 +28,7 @@ import {
 import { getTeacherCustomFieldNumber } from '@/utils/kingdee';
 import { getSalesCodeOptions } from '@/utils/order';
 import { getDefaultString } from '@/utils/StringUtil';
+import { ExclamationCircleOutlined } from '@ant-design/icons';
 import {
   DrawerForm,
   FormListActionType,
@@ -67,6 +68,8 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
     useState(false);
   const [paymentMethod, setPaymentMethod] = useState('');
   const [customerRequestCount, setCustomerRequestCount] = useState(0);
+  const [hasOfficialWebsiteOrderPaid, setHasOfficialWebsiteOrderPaid] =
+    useState(false);
   const [
     productParametersDisabledFlagList,
     setProductParametersDisabledFlagList,
@@ -74,6 +77,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
   // const [productInvStockOptionsList, setProductInvStockOptionsList] = useState(
   //   [],
   // ); //商品的仓库选项
+
   const [productUnitOptionsList, setProductUnitOptionsList] = useState([]); //商品的单位选项
   //省市区
   const [province, setProvince] = useState('');
@@ -773,6 +777,11 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
   }
  
   useEffect(() => {
+    const hasOfficialWebsiteOrderPaidstatus = subOrders.some(
+      (subOrder) =>
+        subOrder.paymentMethod === 'OFFICIAL_WEBSITE_ORDER_HAS_BEEN_PAID',
+    );
+    setHasOfficialWebsiteOrderPaid(hasOfficialWebsiteOrderPaidstatus);
     checkHasLocalData();
     loadSalesCodeOptions();
     if (optType('after-sales-check')) {
@@ -1484,6 +1493,22 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
           rules={[{ required: true, message: '支付方式必填' }]}
           disabled={optType('after-sales-check')}
         />
+        {hasOfficialWebsiteOrderPaid &&
+          paymentMethod !== 'OFFICIAL_WEBSITE_ORDER_HAS_BEEN_PAID' && (
+            <>
+              <span style={{ fontSize: '14px', color: 'orange' }}>
+                <ExclamationCircleOutlined style={{ color: 'orange' }} />
+                【官网订单已付款】改为其他状态代表该订单未收到款，财务模块对这笔订单将不再自动核销，请确认后修改。
+              </span>
+            </>
+          )}
+        {!hasOfficialWebsiteOrderPaid &&
+          paymentMethod === 'OFFICIAL_WEBSITE_ORDER_HAS_BEEN_PAID' && (
+            <span style={{ fontSize: '14px', color: 'orange' }}>
+              <ExclamationCircleOutlined style={{ color: 'orange' }} />
+              【官网订单已付款】的订单后续在财务模块中将自动核销，请确认该订单是否收到款，再选择这个状态。
+            </span>
+          )}
         <ProFormSelect
           name="prepaidUid"
           key="prepaidUid"
@@ -3535,14 +3535,14 @@ const OrderPage = () =&gt; {
                             }
                           } else {
                             //仓库管理员只能编辑是还未审核的订单
-                            if (
+                            /*if (
                               roleCode !== 'admin' &&
                               (orderStatus === 'UNAUDITED' ||
                                 orderStatus === 'AUDIT_FAILED')
                             ) {
                               message.error('请选择已审核的订单进行编辑');
                               return;
-                            }
+                            }*/
                           }
                         }
  
@@ -56,7 +56,7 @@ import KingdeeCustomerModal from &#39;./KingdeeCustomerModal&#39;;
  
 export default ({ onClose, data, subOrders, orderOptType }) => {
   const [invoicingStatus, setInvoicingStatus] = useState('');
-  const [salesCodeOptions, setSalesCodeOptions] = useState([]);
+  const [salesCodeOptions] = useState([]);
   const [submitBtnLoading, setSubmitBtnLoading] = useState(false);
   const [drawerTitle, setDrawerTitle] = useState('');
   const [hasLocalData, setHasLocalData] = useState(false);
@@ -134,8 +134,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
    */
   const loadSalesCodeOptions = async () => {
     let options = await getSalesCodeOptions();
-    setSalesCodeOptions(options);
-
+    console.log('options      ', JSON.stringify(options));
     if (optType('copy') || optType('edit')) {
       let includeFlag = false;
       //销售代码校验，如果是旧的销售代码，则提示并清空