feat: update 供应商复制信息功能，申请修改订单

zhongnanhuang
1 parent e3479f50
Showing 6 changed files with 333 additions and 96 deletions
src/pages/Order/components/CheckModal.tsx
src/pages/Order/components/OrderDrawer.tsx
src/pages/Order/constant.ts
src/pages/Order/index.tsx
src/services/definition.ts
src/services/request.ts
@@ -326,20 +326,6 @@ export default ({
     }
   }
-  /**
-   *
-   * @param body 后置审核
-   */
-  async function doPostAudit(body: object) {
-    const data = await postServiceOrderAudit({
-      data: body,
-    });
-    if (data.result === RESPONSE_CODE.SUCCESS) {
-      message.success(data.message);
-      onClose();
-    }
-  }
-
   return (
     <>
       <ModalForm<{
@@ -366,16 +352,6 @@ export default ({
               <Button
                 key="驳回"
                 onClick={async () => {
-                  if (checkType(CHECK_TYPE.WEARHOUSE_KEEPER)) {
-                    doCheck({
-                      pass: false,
-                      subOrderIds: subOrderIds,
-                      type: 'warehouse_audit',
-                      notes: form.getFieldValue('name'),
-                    });
-                    return;
-                  }
-
                   if (checkType(CHECK_TYPE.AFTER_SALES)) {
                     doAfterSalesCheck({
                       applyType: 'after-sales',
@@ -411,14 +387,25 @@ export default ({
                     return;
                   }
+                  let type = '';
+                  if (checkType(CHECK_TYPE.WEARHOUSE_KEEPER)) {
+                    type = 'warehouse_audit';
+                  }
                   if (checkType(CHECK_TYPE.WAITING_FOR_POST_AUDIT)) {
-                    return doPostAudit({
-                      pass: false,
-                      notes: form.getFieldValue('name'),
-                      type: 'post_audit',
-                      subOrderIds: subOrderIds,
-                    });
+                    type = 'post_audit';
+                  }
+                  if (checkType(CHECK_TYPE.NODE_OPERATING_AUDIT)) {
+                    type = 'node_operating_audit';
                   }
+                  if (checkType(CHECK_TYPE.MODIFY_LEADER_AUDIT)) {
+                    type = 'modify_leader_audit';
+                  }
+                  doCheck({
+                    pass: false,
+                    subOrderIds: subOrderIds,
+                    type: type,
+                    notes: form.getFieldValue('name'),
+                  });
                 }}
               >
                 驳回
@@ -455,16 +442,6 @@ export default ({
         }}
         submitTimeout={2000}
         onFinish={async (values) => {
-          if (checkType(CHECK_TYPE.WEARHOUSE_KEEPER)) {
-            //审核通过mainOrderId
-            return doCheck({
-              pass: true,
-              subOrderIds: subOrderIds,
-              type: 'warehouse_audit',
-              notes: form.getFieldValue('name'),
-            });
-          }
-
           if (checkType(CHECK_TYPE.AFTER_SALES)) {
             //审核通过
             return doAfterSalesCheck({
@@ -499,14 +476,25 @@ export default ({
             });
           }
+          let type = '';
+          if (checkType(CHECK_TYPE.WEARHOUSE_KEEPER)) {
+            type = 'warehouse_audit';
+          }
           if (checkType(CHECK_TYPE.WAITING_FOR_POST_AUDIT)) {
-            return doPostAudit({
-              pass: true,
-              notes: values.name,
-              type: 'post_audit',
-              subOrderIds: subOrderIds,
-            });
+            type = 'post_audit';
+          }
+          if (checkType(CHECK_TYPE.NODE_OPERATING_AUDIT)) {
+            type = 'node_operating_audit';
+          }
+          if (checkType(CHECK_TYPE.MODIFY_LEADER_AUDIT)) {
+            type = 'modify_leader_audit';
           }
+          doCheck({
+            pass: true,
+            subOrderIds: subOrderIds,
+            type: type,
+            notes: form.getFieldValue('name'),
+          });
         }}
         onOpenChange={setCheckVisible}
       >
@@ -8,6 +8,7 @@ import {
   postServiceOrderAddOrder,
   postServiceOrderAfterSalesQuerySnapshotOrder,
   postServiceOrderApplyAfterSales,
+  postServiceOrderApplyModify,
   postServiceOrderQuerySalesCode,
   postServiceOrderUpdateOrder,
 } from '@/services';
@@ -676,12 +677,19 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
             }
             values.applyType = orderOptType;
-            if (optType('after-sales') || optType('order-change-normal')) {
+            if (optType('after-sales')) {
               values.filePaths = values.filePaths?.map((file) => {
                 return { url: file.response.data[0] };
               });
               res = await postServiceOrderApplyAfterSales({ data: values });
             }
+
+            if (optType('order-change-normal')) {
+              values.filePaths = values.filePaths?.map((file) => {
+                return { url: file.response.data[0] };
+              });
+              res = await postServiceOrderApplyModify({ data: values });
+            }
           }
           if (res.result === RESPONSE_CODE.SUCCESS) {
@@ -97,6 +97,8 @@ export const CHECK_TYPE = {
   LEADER_AUDIT: 'LEADER_AUDIT',
   MODIFY_APPLY_WAIT_FOR_AUDIT: 'MODIFY_APPLY_WAIT_FOR_AUDIT',
   WAITING_FOR_POST_AUDIT: 'WAITING_FOR_POST_AUDIT',
+  NODE_OPERATING_AUDIT: 'NODE_OPERATING_AUDIT',
+  MODIFY_LEADER_AUDIT: 'MODIFY_LEADER_AUDIT',
 };
 /**
@@ -169,10 +171,10 @@ export const ORDER_STATUS_OPTIONS = {
 };
 export const MODIFIED_AUDIT_STATUS_OPTIONS = {
-  AUDIT_FAILURE: '审核成功',
-  PENDING_AUDIT_FOR_CURRENT_NODE_PERSONNEL: '当前节点人员待审核',
+  AUDIT_FAILURE: '修改审核失败',
+  PENDING_AUDIT_FOR_CURRENT_NODE_PERSONNEL: '节点待审核',
   LEADER_PENDING_AUDIT: '领导待审核',
-  AUDIT_SUCCESS: '审核成功',
+  AUDIT_SUCCESS: '修改审核成功',
 };
 /**
@@ -360,6 +362,7 @@ export const HISTORY_OPT_TYPE = new Map&lt;string, string&gt;([
   ['order-change-normal-CHECK', '申请修改审核'],
   ['warehouse_audit', '仓库审核'],
   ['post_audit', '后置审核'],
+  ['applyModify', '申请修改订单信息'],
 ]);
 export const MAIN_ORDER_COLUMNS = [
@@ -488,6 +491,13 @@ export const MAIN_ORDER_COLUMNS = [
     valueEnum: enumToProTableEnumValue(ORDER_STATUS_OPTIONS),
   },
   {
+    title: '修改审核状态',
+    dataIndex: 'modifiedAuditStatus',
+    valueType: 'select',
+    hideInTable: true,
+    valueEnum: enumToProTableEnumValue(MODIFIED_AUDIT_STATUS_OPTIONS),
+  },
+  {
     title: '支付方式',
     dataIndex: 'paymentMethod',
     valueType: 'select',
@@ -762,7 +762,11 @@ const OrderPage = () =&gt; {
             {/* 商品名称 */}
             <div>
               <div
-                className="overflow-hidden whitespace-no-wrap overflow-ellipsis"
+                className="overflow-hidden whitespace-no-wrap overflow-ellipsis hover:cursor-pointer"
+                onClick={() => {
+                  copyToClipboard(optRecord.productName);
+                  message.info('商品名称复制成功：' + optRecord.productName);
+                }}
                 title={optRecord.productName}
               >
                 <span className="font-medium text-black ">
@@ -786,6 +790,16 @@ const OrderPage = () =&gt; {
                 ) : (
                   ''
                 )}
+                {optRecord.modifiedOptFlag !== null ? (
+                  <span className="text-[#f44e4e] cursor-pointer">
+                    {optRecord.modifiedOptFlag === 'MODIFY' ? '(修改中)' : ''}
+                    {optRecord.modifiedOptFlag === 'DELETE' ? '(删除中)' : ''}
+                    {optRecord.modifiedOptFlag === 'INSERT' ? '(新增中)' : ''}
+                  </span>
+                ) : (
+                  ''
+                )}
+
                 {optRecord.modified ? (
                   <Tooltip title="点击查看详情">
                     <span
@@ -795,7 +809,7 @@ const OrderPage = () =&gt; {
                         setModifiedDiffModalVisible(true);
                       }}
                     >
-                      (修改过)
+                      (内容有变化)
                     </span>
                   </Tooltip>
                 ) : (
@@ -810,23 +824,32 @@ const OrderPage = () =&gt; {
             </div>
             <div
-              className="overflow-hidden whitespace-no-wrap overflow-ellipsis"
+              className="overflow-hidden whitespace-no-wrap overflow-ellipsis hover:cursor-pointer"
               title={optRecord.parameters}
+              onClick={() => {
+                copyToClipboard(optRecord.parameters);
+                message.info('商品名称复制成功：' + optRecord.parameters);
+              }}
             >
               <span className="text-[#8C8C8C]">
                 参数：{optRecord.parameters}
               </span>
             </div>
-            {userInfo.username !== '首能' ? (
-              <Flex title={optRecord.notes}>
-                <div className="max-w-[375px] whitespace-no-wrap overflow-hidden overflow-ellipsis">
-                  <span className="text-[#8C8C8C]">
-                    备注：
-                    {optRecord.notes === null ? '暂无备注' : optRecord.notes}
-                  </span>
-                </div>
-                {/* 编辑备注按钮 */}
+            <Flex title={optRecord.notes}>
+              <div
+                className="max-w-[375px] whitespace-no-wrap overflow-hidden overflow-ellipsis hover:cursor-pointer"
+                onClick={() => {
+                  copyToClipboard(optRecord.notes);
+                  message.info('备注复制成功：' + optRecord.notes);
+                }}
+              >
+                <span className="text-[#8C8C8C]">
+                  备注：
+                  {optRecord.notes === null ? '暂无备注' : optRecord.notes}
+                </span>
+              </div>
+              {userInfo.username !== '首能' ? (
                 <EditTwoTone
                   className="pl-1 hover:curcor-pointer"
                   onClick={() => {
@@ -836,10 +859,10 @@ const OrderPage = () =&gt; {
                     setNotesType(1);
                   }}
                 />
-              </Flex>
-            ) : (
-              ''
-            )}
+              ) : (
+                ''
+              )}
+            </Flex>
             {(roleCode === 'procure' ||
               roleCode === 'warehouseKeeper' ||
@@ -1163,7 +1186,8 @@ const OrderPage = () =&gt; {
               )}
               {/* 修改审核状态 */}
-              {optRecord.modifiedAuditStatus !== null ? (
+              {optRecord.modifiedAuditStatus !== null &&
+              optRecord.modifiedAuditStatus !== 'AUDIT_FAILURE' ? (
                 <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
                   <Tooltip
                     title={enumValueToLabel(
@@ -1182,6 +1206,29 @@ const OrderPage = () =&gt; {
               ) : (
                 ''
               )}
+
+              {optRecord.modifiedAuditStatus === 'AUDIT_FAILURE' ? (
+                <MyToolTip
+                  key="key"
+                  title={optRecord.modifiedAuditNotes}
+                  content={
+                    <>
+                      <Tag
+                        color={TAGS_COLOR.get(optRecord.modifiedAuditNotes)}
+                        style={{ marginRight: '4px' }}
+                      >
+                        {enumValueToLabel(
+                          optRecord.modifiedAuditStatus,
+                          MODIFIED_AUDIT_STATUS_OPTIONS,
+                        )}
+                      </Tag>
+                      <QuestionCircleOutlined style={{ color: '#C1C1C1' }} />
+                    </>
+                  }
+                />
+              ) : (
+                ''
+              )}
             </div>
           </Flex>
           <Flex className="w-[18%]" wrap="wrap" gap="small">
@@ -1226,10 +1273,42 @@ const OrderPage = () =&gt; {
                 onClick={() => {
                   createOptObject(optRecord.id, record.id);
                   setCheckVisible(true);
-                  setOrderCheckType(CHECK_TYPE.WAITING_FOR_POST_AUDIT);
+                  setOrderCheckType(CHECK_TYPE.NODE_OPERATING_AUDIT);
+                }}
+              >
+                节点修改审核
+              </Button>
+            ) : (
+              ''
+            )}
+
+            {optRecord.subPath?.includes('applyModify') ? (
+              <Button
+                className="p-0"
+                type="link"
+                onClick={() => {
+                  createOptObject(optRecord.id, record.id);
+                  setOrderDrawerVisible(true);
+                  setOrderOptType('order-change-normal');
                 }}
               >
-                修改审核
+                申请修改
+              </Button>
+            ) : (
+              ''
+            )}
+
+            {optRecord.subPath?.includes('modifiedLeaderAuditRequest') ? (
+              <Button
+                className="p-0"
+                type="link"
+                onClick={() => {
+                  createOptObject(optRecord.id, record.id);
+                  setCheckVisible(true);
+                  setOrderCheckType(CHECK_TYPE.MODIFY_LEADER_AUDIT);
+                }}
+              >
+                领导修改审核
               </Button>
             ) : (
               ''
@@ -1333,7 +1412,7 @@ const OrderPage = () =&gt; {
                   setOrderCheckType(CHECK_TYPE.PROCURE);
                 }}
               >
-                采购发货
+                {userInfo.username === '首能' ? '发货' : '采购发货'}
               </Button>
             ) : (
               ''
@@ -1950,14 +2029,18 @@ const OrderPage = () =&gt; {
                 <span>{formatDateTime(record.createTime)}</span>
                 <Divider type="vertical" />
                 <Space split={<Divider type="vertical" />}>
+                  <div
+                    className="hover:cursor-pointer"
+                    onClick={() => {
+                      copyToClipboard(record.salesCode);
+                      message.info('代表复制成功：' + record.salesCode);
+                    }}
+                  >
+                    <span className="text-[#8C8C8C]">代表：</span>
+                    <span className="text-slate-700">{record.salesCode}</span>
+                  </div>
                   {userInfo?.username !== '首能' ? (
                     <>
-                      <div>
-                        <span className="text-[#8C8C8C]">代表：</span>
-                        <span className="text-slate-700">
-                          {record.salesCode}
-                        </span>
-                      </div>
                       <div
                         title={record.institution}
                         className="whitespace-no-wrap overflow-hidden overflow-ellipsis max-w-[150px]"
@@ -1977,7 +2060,13 @@ const OrderPage = () =&gt; {
                   ) : (
                     ''
                   )}
-                  <span>
+                  <span
+                    className="hover:cursor-pointer"
+                    onClick={() => {
+                      copyToClipboard(record.customerName);
+                      message.info('收货人复制成功：' + record.customerName);
+                    }}
+                  >
                     <span className="text-[#8C8C8C]">收货人：</span>
                     <span className="text-slate-700">
                       {record.customerName + ' '}
@@ -2000,7 +2089,13 @@ const OrderPage = () =&gt; {
                   {userInfo?.username === '首能' ? (
                     <div
                       title={record.customerShippingAddress}
-                      className="whitespace-no-wrap overflow-hidden overflow-ellipsis max-w-[500px]"
+                      className="whitespace-no-wrap overflow-hidden overflow-ellipsis max-w-[500px] hover:cursor-pointer"
+                      onClick={() => {
+                        copyToClipboard(record.customerShippingAddress);
+                        message.info(
+                          '收货地址复制成功：' + record.customerShippingAddress,
+                        );
+                      }}
                     >
                       <span className="text-[#8C8C8C]">收货地址：</span>
                       <span className="text-slate-700">
@@ -2039,24 +2134,35 @@ const OrderPage = () =&gt; {
               {roleCode === 'finance' ? <Divider type="vertical" /> : ''}
               <div title={record.notes}>
-                <div className="max-w-md overflow-hidden whitespace-no-wrap overflow-ellipsis">
+                <div
+                  className="max-w-md overflow-hidden whitespace-no-wrap overflow-ellipsis hover:cursor-pointer"
+                  onClick={() => {
+                    copyToClipboard(record.notes);
+                    message.info('备注复制成功：' + record.notes);
+                  }}
+                >
                   <span className="text-[#8C8C8C]">备注：</span>
                   <span className="ml-2">
                     {record.notes === null ? '暂无备注' : record.notes}
                   </span>
                 </div>
               </div>
-              <Tooltip title="编辑">
-                <EditTwoTone
-                  className="pl-1 hover:curcor-pointer"
-                  onClick={() => {
-                    setNotesEditVisible(true);
-                    setSelectedRows([record.id]);
-                    setNotes(record.notes);
-                    setNotesType(0);
-                  }}
-                />
-              </Tooltip>
+
+              {userInfo.username !== '首能' ? (
+                <Tooltip title="编辑">
+                  <EditTwoTone
+                    className="pl-1 hover:curcor-pointer"
+                    onClick={() => {
+                      setNotesEditVisible(true);
+                      setSelectedRows([record.id]);
+                      setNotes(record.notes);
+                      setNotesType(0);
+                    }}
+                  />
+                </Tooltip>
+              ) : (
+                ''
+              )}
             </Flex>
           </Flex>
           <Flex wrap="wrap" gap="middle" vertical>
@@ -2115,6 +2221,38 @@ const OrderPage = () =&gt; {
             <Flex justify="flex-end">
               <Space.Compact direction="vertical" align="end">
                 <Space wrap>
+                  {record.mainPath?.includes('modifiedAuditRequest') ? (
+                    <Button
+                      className="p-0"
+                      type="link"
+                      onClick={() => {
+                        createOptObject(null, record.id);
+                        setCheckVisible(true);
+                        setOrderCheckType(CHECK_TYPE.NODE_OPERATING_AUDIT);
+                      }}
+                    >
+                      节点修改审核
+                    </Button>
+                  ) : (
+                    ''
+                  )}
+
+                  {record.mainPath?.includes('modifiedLeaderAuditRequest') ? (
+                    <Button
+                      className="p-0"
+                      type="link"
+                      onClick={() => {
+                        createOptObject(null, record.id);
+                        setCheckVisible(true);
+                        setOrderCheckType(CHECK_TYPE.MODIFY_LEADER_AUDIT);
+                      }}
+                    >
+                      领导修改审核
+                    </Button>
+                  ) : (
+                    ''
+                  )}
+
                   {false ? (
                     <Button
                       className="p-0"
@@ -2212,7 +2350,7 @@ const OrderPage = () =&gt; {
                     ''
                   )}
-                  {record.mainPath?.includes('orderChangeRequest') ? (
+                  {record.mainPath?.includes('applyModify') ? (
                     <Button
                       className="p-0"
                       type="link"
@@ -2396,7 +2534,7 @@ const OrderPage = () =&gt; {
                         setOrderCheckType(CHECK_TYPE.PROCURE);
                       }}
                     >
-                      采购发货
+                      {userInfo.username === '首能' ? '发货' : '采购发货'}
                     </Button>
                   ) : (
                     ''
@@ -3101,6 +3239,14 @@ const OrderPage = () =&gt; {
   // 主订单列表
   const mainOrdersColumns: ProColumns<OrderType>[] = MAIN_ORDER_COLUMNS.map(
     (item) => {
+      //首能账号只能搜索订单编号
+      let canSearchIndex = ['id', 'salesCode', 'subNotes', 'orderStatus'];
+      if (
+        userInfo.username === '首能' &&
+        !canSearchIndex.includes(item.dataIndex)
+      ) {
+        item.search = false;
+      }
       if (item.dataIndex === 'name') {
         return {
           ...item,
@@ -3126,7 +3272,10 @@ const OrderPage = () =&gt; {
   /**
    * 采购可以筛选供应商备注
    */
-  if (roleCode === 'procure' || roleCode === 'admin') {
+  if (
+    (roleCode === 'procure' || roleCode === 'admin') &&
+    userInfo.username !== '首能'
+  ) {
     mainOrdersColumns.push({
       title: '供应商备注',
       width: 120,
@@ -3139,7 +3288,10 @@ const OrderPage = () =&gt; {
   /**
    * 采购可以筛选其他采购
    */
-  if (roleCode === 'procure' || roleCode === 'admin') {
+  if (
+    (roleCode === 'procure' || roleCode === 'admin') &&
+    userInfo.username !== '首能'
+  ) {
     mainOrdersColumns.push({
       title: '采购名称',
       width: 120,
@@ -3200,7 +3352,7 @@ const OrderPage = () =&gt; {
     }
     //采购可以筛选出需要处理的订单
-    if (roleCode === 'procure') {
+    if (roleCode === 'procure' && userInfo.username !== '首能') {
       radios.push(<Radio value={60}>其他采购</Radio>);
       radios.push(<Radio value={10}>待处理</Radio>);
     }
@@ -313,8 +313,16 @@ export interface AdminUserVO {
 export interface AuditDto {
   notes?: string;
+  /**
+   * @description
+   *   是否通过
+   */
   pass?: boolean;
   subOrderIds?: Array<number>;
+  /**
+   * @description
+   *   审核类型：post_audit 后置审核、node_operating_audit 节点操作人审核、warehouse_audit 仓库审核
+   */
   type?: string;
 }
@@ -6398,7 +6398,7 @@ export type PostServiceOrderAfterSalesCheckResponseSuccess =
   PostServiceOrderAfterSalesCheckResponse[200];
 /**
  * @description
- *   修改订单审核
+ *   修改审核
  * @tags 内部订单
  * @produces *
  * @consumes application/json
@@ -6636,6 +6636,77 @@ export const postServiceOrderApplyInvoicing = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
+/** @description request parameter type for postServiceOrderApplyModify */
+export interface PostServiceOrderApplyModifyOption {
+  /**
+   * @description
+   *   dto
+   */
+  body: {
+    /**
+        @description
+          dto */
+    dto: Dto;
+  };
+}
+
+/** @description response type for postServiceOrderApplyModify */
+export interface PostServiceOrderApplyModifyResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceOrderApplyModifyResponseSuccess =
+  PostServiceOrderApplyModifyResponse[200];
+/**
+ * @description
+ *   申请修改订单信息
+ * @tags 内部订单
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceOrderApplyModify = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/service/order/applyModify';
+  function request(
+    option: PostServiceOrderApplyModifyOption,
+  ): Promise<PostServiceOrderApplyModifyResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostServiceOrderApplyModifyResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description request parameter type for postServiceOrderAudit */
 export interface PostServiceOrderAuditOption {
   /**