Merge branch 'bugfix-0714' into 'master'

Bugfix 0714 See merge request !64

Merge branch 'bugfix-0714' into 'master'
Bugfix 0714 See merge request !64
柏杨
2 parents 88ebf2c0 19802ede
Showing 6 changed files with 47 additions and 64 deletions
src/pages/Order/Order/index.tsx
src/pages/Order/OrderList/InvoicingDrawerForm.tsx
src/pages/Order/OrderList/OrderDrawer.tsx
src/pages/Order/OrderList/OrderList.tsx
src/pages/Order/constant.ts
src/pages/ResearchGroup/ResearchGroup/index.tsx
@@ -135,6 +135,11 @@ const OrderPage = () =&gt; {
             >
               去处理
             </Button>,
+            roleCode === 'ADMIN' && (
+              <Button key="cancel" size="large" onClick={() => setOpen(false)}>
+                取消
+              </Button>
+            ),
           ]}
         >
           <ProCard
@@ -135,6 +135,8 @@ export default ({
       autoFocusFirstInput
       drawerProps={{
         destroyOnClose: true,
+        maskClosable: false,
+        onClose: () => setVisible(false),
       }}
       submitter={{
         render: (props, defaultDoms) => {
@@ -447,6 +447,10 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
         'HCTB',
         '淘宝',
         'TAOBAO',
+        '新能源材料网',
+        'scilab固态电解质商城',
+        'T-ACG',
+        'ALBB',
       ].includes(salesCode);
       if (isTaobaoSalesCode) {
@@ -1182,6 +1186,10 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
               'HCTB',
               '淘宝',
               'TAOBAO',
+              '新能源材料网',
+              'scilab固态电解质商城',
+              'T-ACG',
+              'ALBB',
             ].includes(value);
             // 如果是复制操作且是淘宝销售代码，锁定支付方式和支付渠道，不清空值
@@ -2021,60 +2029,6 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
             }
           }}
         />
-        {/* <ProFormSelect
-          placeholder="请输入支付方式"
-          name="paymentMethod"
-          width="lg"
-          key="paymentMethod"
-          label="支付方式"
-          onChange={(val: any) => {
-            setPaymentMethod(val);
-          }}
-          options={[
-            // 默认可选项
-            ...enumToSelect(PAYMENT_METHOD_OPTIONS_4_ADD).map(option => {
-              // 将淘宝选项设置为禁用状态，使其无法手动选择
-              if (option.value === 'PAYMENT_IN_TAOBAO') {
-                return { ...option, disabled: true };
-              }
-              return option;
-            }),
-            // 强制禁用项
-            { label: '未付款', value: 'UNPAID', disabled: true },
-            {
-              label: '淘宝订单已付款',
-              value: 'TAOBAO_ORDER_HAS_BEEN_PAID',
-              disabled: true,
-            },
-            {
-              label: '官网已付',
-              value: 'OFFICIAL_WEBSITE_ORDER_HAS_BEEN_PAID',
-              disabled: true,
-            },
-            {
-              label: '淘宝',
-              value: 'PAYMENT_IN_TAOBAO',
-              disabled: true,
-            },
-            {
-              label: '预付',
-              value: 'WITHHOLDING_ADVANCE_DEPOSIT',
-              disabled: true,
-            },
-            { label: '平台结算', value: 'PLATFORM_SETTLEMENT', disabled: true },
-            { label: '已回款', value: 'PAYMENT_RECEIPT', disabled: true },
-            {
-              label: '预存款无需发货',
-              value: 'PREPAID_NO_NEED_SEND',
-              disabled: true,
-            },
-          ]}
-          rules={[{ required: true, message: '支付方式必填' }]}
-          disabled={optType('after-sales-check') || paymentMethodDisabled}
-          fieldProps={{
-            style: paymentMethodDisabled ? { backgroundColor: '#f5f5f5' } : {},
-          }}
-        /> */}
         {/* 隐藏字段用于存储真实UID和privatePocket标志 */}
         <ProFormText name="realPrepaidUid" hidden />
         <ProFormText name="privatePocket" hidden />
@@ -2852,7 +2852,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
                   <div>
                     <span className="text-[#8C8C8C]">总金额：￥</span>
                     <span className="text-lg font-medium">
-                      {record.totalPayment || '-'}
+                      {record.totalPayment || '0'}
                     </span>
                   </div>
                 ) : (
@@ -4797,7 +4797,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
       setNewParams(paramsNew);
       console.log(newParams);
     }
-    refreshTable();
+    // refreshTable();
   }, [paramsNew]);
   return (
     <div className="order-page-container">
@@ -29,8 +29,7 @@ export const PAYMENT_METHOD_OPTIONS = {
   OFFICIAL_WEBSITE_ORDER_HAS_BEEN_PAID: '官网已付',
   PAYMENT_IN_ADVANCE: '预付',
   PAYMENT_IN_TAOBAO: '淘宝',
-  WITHHOLDING_ADVANCE_DEPOSIT: '预付(扣预存)',
-  PLATFORM_SETTLEMENT: '平台结算',
+  // WITHHOLDING_ADVANCE_DEPOSIT: '预付(扣预存)',
   CASH_ON_DELIVERY: '货到付款',
   HIRE_PURCHASE: '分期付款',
   // PAYMENT_RECEIPT: '已回款',
@@ -531,17 +531,29 @@ const ResearchGroupListPage = () =&gt; {
           columns={researchGroupColumnsInit()}
           actionRef={researchGroupActionRef}
           cardBordered
+          manualRequest={false}
+          dataSource={undefined} // Use undefined to force server fetch
           pagination={{
-            pageSize: 10,
+            showSizeChanger: true,
+            pageSizeOptions: ['10', '20', '50', '100'],
+            defaultCurrent: 1,
+            defaultPageSize: 10,
           }}
+          scroll={{ x: 1400 }}
           request={async (params) => {
+            const { current, pageSize, ...rest } = params;
             const res = await postResearchGroupsList({
-              data: { ...params },
+              data: {
+                current: current,
+                pageSize: pageSize,
+                ...rest,
+              },
             });
             setPerms(res.data.specialPath);
             return {
               data: res?.data?.data || [],
               total: res?.data?.total || 0,
+              success: res && res.result === RESPONSE_CODE.SUCCESS,
             };
           }}
           columnsState={{
@@ -566,7 +578,6 @@ const ResearchGroupListPage = () =&gt; {
           form={{}}
           dateFormatter="string"
           headerTitle="课题组列表"
-          scroll={{ x: 1400 }}
           toolBarRender={() => {
             let btns = [];
             if (perms?.includes('add')) {
@@ -640,17 +651,29 @@ const ResearchGroupListPage = () =&gt; {
           columns={memberApplyColumnsInit()}
           actionRef={memberApplyActionRef}
           cardBordered
+          manualRequest={false}
+          dataSource={undefined} // Use undefined to force server fetch
           pagination={{
-            pageSize: 10,
+            showSizeChanger: true,
+            pageSizeOptions: ['10', '20', '50', '100'],
+            defaultCurrent: 1,
+            defaultPageSize: 10,
           }}
+          scroll={{ x: 1400 }}
           request={async (params) => {
+            const { current, pageSize, ...rest } = params;
             const res = await postResearchGroupMemberRequestsList({
-              data: { ...params },
+              data: {
+                current: current,
+                pageSize: pageSize,
+                ...rest,
+              },
             });
             setPerms(res.data.specialPath);
             return {
               data: res?.data?.data || [],
               total: res?.data?.total || 0,
+              success: res && res.result === RESPONSE_CODE.SUCCESS,
             };
           }}
           columnsState={{
@@ -666,6 +689,7 @@ const ResearchGroupListPage = () =&gt; {
           rowKey="id"
           search={{
             labelWidth: 'auto',
+            defaultCollapsed: false,
           }}
           options={{
             setting: {
@@ -675,7 +699,6 @@ const ResearchGroupListPage = () =&gt; {
           form={{}}
           dateFormatter="string"
           headerTitle="申请列表"
-          scroll={{ x: 1400 }}
           toolBarRender={() => {
             let btns = [];
             btns.push(