feat(Order): 课题组新需求

● 去掉审核按钮，新增课题组无需审核 ● 列表中去掉审核状态 ● 查询条件中去掉审核状态 ● 新增课题组页面，课题组名称输入框提示语修改为：请按规范输入，如:张三老师 ● 数据判重，当添加数据的课题组名称和单位名称同时存在时，提交时提示：该课题组已存在！ ● 课题组名称和单位名称不允许输入除了汉字、字母和数字之外的特殊字符；须支持空格的输入，部分海外客户课题组为英文，单词之间会存在空格 ● 新增后的课题组仅管理员可修改、删除

feat(Order): 课题组新需求
● 去掉审核按钮，新增课题组无需审核 ● 列表中去掉审核状态 ● 查询条件中去掉审核状态 ● 新增课题组页面，课题组名称输入框提示语修改为：请按规范输入，如:张三老师 ● 数据判重，当添加数据的课题组名称和单位名称同时存在时，提交时提示：该课题组已存在！ ● 课题组名称和单位名称不允许输入除了汉字、字母和数字之外的特殊字符；须支持空格的输入，部分海外客户课题组为英文，单词之间会存在空格 ● 新增后的课题组仅管理员可修改、删除
曾国涛
1 parent 7d171173
Showing 6 changed files with 109 additions and 75 deletions
src/pages/Order/OrderList/OrderDrawer.tsx
src/pages/ResearchGroup/components/ResearchGroupAddModal.tsx
src/pages/ResearchGroup/constant.tsx
src/pages/ResearchGroup/index.tsx
src/services/definition.ts
src/services/request.ts
@@ -598,6 +598,21 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
     form.setFieldValue('totalPayment', totalPayment);
   }
+  /*function computeTotalPayment() {
+    let list = form.getFieldValue('list');
+    let totalPaymentInMicro = 0; // 以"1 万分"为单位计算
+
+    list?.forEach((subOrder: any) => {
+      let subOrderPayment = subOrder?.subOrderPayment;
+      if (subOrderPayment !== '' && subOrderPayment !== undefined) {
+        totalPaymentInMicro += Math.round(subOrderPayment * 10000); // 转换成整数（1 万分）
+      }
+    });
+
+    let totalPayment = totalPaymentInMicro / 10000; // 计算完后转换回元
+    form.setFieldValue('totalPayment', totalPayment.toFixed(2)); // 保留 4 位小数
+  }*/
+
   /**
    * 检查用户额度
    * @param option
@@ -726,18 +741,6 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
     }
   }
-  const validateContactNumber = (_: any, value: any) => {
-    const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
-    const phoneRegex = /^\d{1,11}(-\d{1,11})?$/;
-
-    if (emailRegex.test(value) || phoneRegex.test(value)) {
-      return Promise.resolve();
-    }
-    return Promise.reject(
-      new Error('联系方式必须是邮箱或手机号格式（不能包含空格等特殊符号）'),
-    );
-  };
-
   /**
    * 刪除草稿数据
    */
@@ -1205,10 +1208,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
               loadAccountOptions(v.target.value);
             },
           }}
-          rules={[
-            { required: true, message: '联系方式必填' },
-            { validator: validateContactNumber },
-          ]}
+          rules={[{ required: true, message: '联系方式必填' }]}
         />
         <ProFormText
           width="lg"
@@ -1712,6 +1712,18 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                 return Promise.resolve();
               },
             },
+            {
+              validator: (_, value) => {
+                // 自定义校验逻辑
+                if (
+                  form.getFieldValue('totalPayment') === 0 &&
+                  value !== 'UN_INVOICE'
+                ) {
+                  return Promise.reject('金额为0订单不能开票');
+                }
+                return Promise.resolve();
+              },
+            },
           ]}
         />
         <ProFormSelect
@@ -347,7 +347,7 @@ export default ({ setVisible, researchGroupId, onClose }) =&gt; {
               name="groupName"
               label="课题组名称"
               placeholder="请输入课题组名称"
-              rules={[{ required: true, message: '请输入课题组名称' }]}
+              rules={[{ required: true, message: '请按规范输入，如:张三老师' }]}
             />
             <ProFormText
               name="companyName"
-import { postServiceConstListResearchGroupsStatus } from '@/services';
-import { enumToProTableEnumValue, enumToSelect } from '@/utils';
-import { MessageTwoTone } from '@ant-design/icons';
-import { Space, Tooltip } from 'antd';
+import { enumToProTableEnumValue } from '@/utils';
+
 export const AUDIT_STATUS_OPTIONS = {
   CREATED: '未审核',
   AUDIT_PASS: '审核通过',
@@ -55,38 +53,6 @@ export const RESEARCH_GROUP_COLUMNS = [
     hideInSearch: true,
   },
   {
-    title: '状态',
-    dataIndex: 'statusText',
-    key: 'statusText',
-    hideInSearch: true,
-    render: (_, record) => {
-      console.log('1111' + JSON.stringify(record));
-      return (
-        <>
-          <Space>
-            {record.statusText}
-            {record.statusNotes && (
-              <Tooltip title={record.statusNotes}>
-                <MessageTwoTone />
-              </Tooltip>
-            )}
-          </Space>
-        </>
-      );
-    },
-  },
-  {
-    title: '状态',
-    dataIndex: 'status',
-    key: 'status',
-    valueType: 'select',
-    request: async () => {
-      const groupStatus = await postServiceConstListResearchGroupsStatus();
-      return enumToSelect(groupStatus.data);
-    },
-    hideInTable: true,
-  },
-  {
     title: '预存手机号',
     dataIndex: 'accountPhone',
     key: 'accountPhone',
@@ -224,11 +190,11 @@ export const RESEARCH_GROUP_MEMBER_REQUEST_COLUMNS = [
     valueEnum: {
       ADD_MEMBER: {
         text: '新增成员',
-        status: 'ADD_MEMBER'
+        status: 'ADD_MEMBER',
       },
       ADD_ACCOUNT: {
         text: '新增课题组',
-        status: 'ADD_ACCOUNT'
+        status: 'ADD_ACCOUNT',
       },
     },
     hideInTable: true,
@@ -573,11 +573,6 @@ const PrepaidPage = () =&gt; {
             let ids = selectedRows.map((item: any) => {
               return item.id;
             });
-            let canAudit =
-              selectedRows.length > 0 &&
-              selectedRows.every((item) => {
-                return item.paths?.includes('ADD_AUDIT');
-              });
             return (
               <Space size={16}>
                 <ButtonConfirm
@@ -592,21 +587,6 @@ const PrepaidPage = () =&gt; {
                 <Button type="link" onClick={onCleanSelected}>
                   取消选中
                 </Button>
-
-                {
-                  <Button
-                    key="audit"
-                    type="link"
-                    disabled={!canAudit}
-                    onClick={async () => {
-                      setAuditIds(ids);
-                      setAuditModalVisible(true);
-                      setAuditType('research_groups_add_audit');
-                    }}
-                  >
-                    审核
-                  </Button>
-                }
               </Space>
             );
           }}
@@ -1687,6 +1687,11 @@ export interface InvoiceDto {
   orderTypeText?: string;
   /**
    * @description
+   *   买方税号
+   */
+  partyATaxid?: string;
+  /**
+   * @description
    *   权限路径
    */
   path?: Array<string>;
@@ -21212,6 +21212,77 @@ export const postServiceOrderExport = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
+/** @description request parameter type for postServiceOrderExportLockOrders */
+export interface PostServiceOrderExportLockOrdersOption {
+  /**
+   * @description
+   *   dto
+   */
+  body: {
+    /**
+        @description
+          dto */
+    dto: QueryWarningOrderStatistics;
+  };
+}
+
+/** @description response type for postServiceOrderExportLockOrders */
+export interface PostServiceOrderExportLockOrdersResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: any;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceOrderExportLockOrdersResponseSuccess =
+  PostServiceOrderExportLockOrdersResponse[200];
+/**
+ * @description
+ *   exportLockOrders
+ * @tags 内部订单
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceOrderExportLockOrders = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/service/order/exportLockOrders';
+  function request(
+    option: PostServiceOrderExportLockOrdersOption,
+  ): Promise<PostServiceOrderExportLockOrdersResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostServiceOrderExportLockOrdersResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description response type for postServiceOrderExportTemplate */
 export interface PostServiceOrderExportTemplateResponse {
   /**