feat: update

zhongnanhuang
1 parent 20d041c0
Showing 9 changed files with 318 additions and 34 deletions
src/pages/Invoice/components/BankChooseModal.tsx
src/pages/Invoice/components/BankImportModal.tsx
src/pages/Order/components/KingdeeCustomerModal.tsx
src/pages/Order/components/OrderDrawer.tsx
src/pages/Order/components/ShippingWarehouseChangeModal.tsx
src/pages/Order/constant.ts
src/pages/Order/index.tsx
src/services/definition.ts
src/services/request.ts
@@ -175,7 +175,6 @@ export default ({ invoiceId, setVisible, onClose }) =&gt; {
     let i = 0;
  
     let tags = selectedStatement.map((item) => {
-      console.log(item);
       let tagText = item.id;
  
       if (item.payeePayerName) {
@@ -206,8 +205,6 @@ export default ({ invoiceId, setVisible, onClose }) =&gt; {
       );
     });
  
-    console.log(tags);
-
     return tags;
   };
  
@@ -36,7 +36,6 @@ export default ({ setVisible, onClose }) =&gt; {
       headers: { Authorization: localStorage.getItem('token') },
     })
       .then((response) => {
-        console.log(response);
         // 创建一个新的 Blob 对象，它包含了服务器响应的数据（即你的 Excel 文件）
         const blob = new Blob([response.data]); // Excel 的 MIME 类型
         const downloadUrl = window.URL.createObjectURL(blob);
@@ -15,7 +15,6 @@ import { Form, message } from &#39;antd&#39;;
 // import { cloneDeep } from 'lodash';
 export default ({ setVisible, data, onClose }) => {
   const [form] = Form.useForm();
-  console.log(data);
  
   /**
    * 回显客户信息
@@ -42,6 +42,7 @@ import {
   PAYMENT_CHANNEL_OPTIONS,
   PAYMENT_METHOD_OPTIONS,
   PRODUCT_BELONG_DEPARTMENT_OPTIONS,
+  SHIPPING_WAREHOUSE_OPTIONS,
 } from '../constant';
 import KingdeeCustomerModal from './KingdeeCustomerModal';
  
@@ -130,7 +131,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
           includeFlag = true;
         }
       }
-      console.log(includeFlag);
+
       if (!includeFlag) {
         form.resetFields(['salesCode']);
         message.warning('检测到销售代码为旧的，已清空，请重新选择');
@@ -205,7 +206,6 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
    * 回显金蝶信息
    */
   async function showKindeeInfo() {
-    console.log(copyData);
     //客户信息
     if (copyData.customerId) {
       //客户回显
@@ -242,15 +242,18 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
           }
         }
       }
-      //订单修改和新增的子订单列表命名是list
-      copyData.list = copyData.subOrderInformationLists;
       //主订单事业部默认显示子订单第一条的事业部
-      copyData.productBelongBusiness = copyData.list[0].productBelongBusiness;
-      copyData.paymentMethod = copyData.list[0].paymentMethod;
-      copyData.paymentChannel = copyData.list[0].paymentChannel;
-      copyData.invoicingStatus = copyData.list[0].invoicingStatus;
-
-      copyData.list = copyData.list?.map((item) => {
+      copyData.productBelongBusiness =
+        copyData.subOrderInformationLists[0].productBelongBusiness;
+      copyData.paymentMethod =
+        copyData.subOrderInformationLists[0].paymentMethod;
+      copyData.paymentChannel =
+        copyData.subOrderInformationLists[0].paymentChannel;
+      copyData.invoicingStatus =
+        copyData.subOrderInformationLists[0].invoicingStatus;
+
+      //子订单数据处理：子订单在表单中的命名为list
+      let newList = copyData.subOrderInformationLists?.map((item) => {
         item.filePaths = item.listAnnex?.map((path) => {
           let i = 0;
           return {
@@ -263,23 +266,32 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
         });
         return item;
       });
-    }
  
-    if (subOrders !== undefined && subOrders.length > 0) {
-      copyData.list = subOrders;
-    }
+      copyData.list = newList;
  
-    setInvoicingStatus(copyData.invoicingStatus);
+      if (subOrders !== undefined && subOrders.length > 0) {
+        copyData.list = subOrders;
+      }
  
-    form.setFieldsValue({ ...copyData });
-    //如果是新建，需要清空list
-    if (optType('add')) {
-      form.resetFields(['list']);
-    }
+      //发货仓库处理
+      for (let listItem of copyData.list) {
+        if (listItem.shippingWarehouse === null) {
+          listItem.shippingWarehouse = 'DALANG_WAREHOUSE';
+        }
+      }
  
-    getSalesCodeOptions();
-    if (!optType('after-sales-check')) {
-      showKindeeInfo();
+      setInvoicingStatus(copyData.invoicingStatus);
+
+      form.setFieldsValue({ ...copyData });
+
+      //如果是新建，需要清空list
+      if (optType('add')) {
+        form.resetFields(['list']);
+      }
+
+      if (!optType('after-sales-check')) {
+        showKindeeInfo();
+      }
     }
   }
  
@@ -357,6 +369,23 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
   }, [data]);
  
   /**
+   * 所属部门修改事件
+   * 如果选择实验耗材事业部，那么发货仓库默认是大朗仓库
+   * @param val
+   */
+  function productBelongBusinessChange(val: any, index: any) {
+    if (val === 'EXPERIMENTAL_CONSUMABLES') {
+      let list = form.getFieldValue('list');
+      let currentData = list[index];
+      if (currentData) {
+        currentData.shippingWarehouse = 'DALANG_WAREHOUSE';
+        form.setFieldValue('list', list);
+        message.info('已默认选择大朗仓库');
+      }
+    }
+  }
+
+  /**
    *
    * @param option 商品名称所对应的商品数据
    * @param currentRowData list中当前行的数据
@@ -471,7 +500,6 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
    * @param option
    */
   function autoFillSalesInfo(option: any) {
-    console.log(option);
     //销售代表对应职员编码填充
     form.setFieldValue('empNumber', option.number);
   }
@@ -540,6 +568,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
   };
  
   useEffect(() => {
+    getSalesCodeOptions();
     if (optType('after-sales-check')) {
       getOldOrderData(data.id);
     } else {
@@ -605,7 +634,6 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
           // console.log(list);
           list = list.map((item) => {
             item.filePaths = item.filePaths?.map((file) => {
-              console.log(file);
               return { url: file.response.data[0] };
             });
             return item;
@@ -856,7 +884,6 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
               });
             }
  
-            console.log(options);
             return options;
           }}
         />
@@ -1304,10 +1331,22 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                     width="lg"
                     label="所属事业部"
                     options={enumToSelect(PRODUCT_BELONG_DEPARTMENT_OPTIONS)}
+                    onChange={(val: any) => {
+                      productBelongBusinessChange(val, listMeta.index);
+                    }}
                     initialValue={'EXPERIMENTAL_CONSUMABLES'}
                     rules={[{ required: true, message: '所属事业部必填' }]}
                     disabled={optType('after-sales-check')}
                   />,
+                  <ProFormSelect
+                    key={'shippingWarehouse' + listMeta.index}
+                    placeholder="请选择发货仓库"
+                    name="shippingWarehouse"
+                    width="lg"
+                    label="发货仓库"
+                    options={enumToSelect(SHIPPING_WAREHOUSE_OPTIONS)}
+                    disabled={optType('after-sales-check')}
+                  />,
                   <ProFormTextArea
                     key={'notes' + listMeta.index}
                     width="lg"
+import { RESPONSE_CODE } from '@/constants/enum';
+import { postServiceOrderShippingWarehouseChange } from '@/services';
+import { enumToSelect } from '@/utils';
+import { ModalForm, ProFormSelect } from '@ant-design/pro-components';
+import { Form, message } from 'antd';
+import { SHIPPING_WAREHOUSE_OPTIONS } from '../constant';
+
+export default ({
+  setVisible,
+  subOrderIds,
+  originShippingWarehouse,
+  onClose,
+}) => {
+  const [form] = Form.useForm<{ shippingWarehouse: string }>();
+
+  let newOriginShippingWarehouse = originShippingWarehouse;
+  if (
+    originShippingWarehouse === null ||
+    originShippingWarehouse === undefined
+  ) {
+    newOriginShippingWarehouse = 'DALANG_WAREHOUSE';
+  }
+  return (
+    <>
+      <ModalForm<{
+        shippingWarehouse: string;
+      }>
+        width={500}
+        open
+        title="修改发货仓库"
+        form={form}
+        autoFocusFirstInput
+        modalProps={{
+          okText: '保存',
+          cancelText: '取消',
+          destroyOnClose: true,
+          onCancel: () => {
+            setVisible(false);
+          },
+        }}
+        onFinish={async (values) => {
+          let res = await postServiceOrderShippingWarehouseChange({
+            data: {
+              ...values,
+              ids: subOrderIds,
+            },
+          });
+
+          if (res && res.result === RESPONSE_CODE.SUCCESS) {
+            message.success(res.message);
+          }
+          onClose();
+        }}
+        onOpenChange={setVisible}
+      >
+        <ProFormSelect
+          key={'shippingWarehouse'}
+          placeholder="请选择发货仓库"
+          name="shippingWarehouse"
+          width="lg"
+          label="发货仓库"
+          rules={[{ required: true, message: '发货仓库必填' }]}
+          initialValue={newOriginShippingWarehouse}
+          options={enumToSelect(SHIPPING_WAREHOUSE_OPTIONS)}
+        />
+        ,
+      </ModalForm>
+    </>
+  );
+};
@@ -37,6 +37,11 @@ export const PRODUCT_BELONG_DEPARTMENT_OPTIONS = {
   CLAMPING_APPARATUS: '工夹具事业部',
 };
  
+export const SHIPPING_WAREHOUSE_OPTIONS = {
+  DALANG_WAREHOUSE: '大朗仓库',
+  HOUJIE_WAREHOUSE: '厚街仓库',
+};
+
 export const INVOCING_STATUS_OPTIONS_OLD = {
   UN_INVOICE: '不需开票',
   SPECIALLY_INVOICED: '专票',
@@ -522,6 +527,12 @@ export const MAIN_ORDER_COLUMNS = [
     valueEnum: enumToProTableEnumValue(AFTER_INVOICING_STATUS),
   },
   {
+    title: '发票号码',
+    dataIndex: 'invoiceNumberLike',
+    valueType: 'text',
+    hideInTable: true,
+  },
+  {
     title: '付款公司',
     dataIndex: 'receivingCompany',
     valueType: 'select',
@@ -7,6 +7,7 @@ import {
   postServiceOrderOrderCancel,
   postServiceOrderProcureOrder,
   postServiceOrderProcurePrint,
+  postServiceOrderProvideProcurementRoles,
   postServiceOrderQueryServiceOrder,
   postServiceOrderSaleCancelInvoicing,
 } from '@/services';
@@ -73,6 +74,7 @@ import OrderDrawer from &#39;./components/OrderDrawer&#39;;
 import OrderNotesEditModal from './components/OrderNotesEditModal';
 import ProcureCheckModal from './components/ProcureCheckModal';
 import ProcureConvertModal from './components/ProcureConvertModal';
+import ShippingWarehouseChangeModal from './components/ShippingWarehouseChangeModal';
 import SubOrderComfirmReceiptImagesModal from './components/SubOrderComfirmReceiptImagesModal';
 import {
   AFTER_INVOICING_STATUS,
@@ -86,6 +88,7 @@ import {
   PROCURE_ORDER_STATUS,
   PROCURE_PRIMARY_ORDER_STATUS_OPTIONS,
   PRODUCT_BELONG_DEPARTMENT_OPTIONS,
+  SHIPPING_WAREHOUSE_OPTIONS,
   TAGS_COLOR,
   getInvoicingType,
   getNeedInvoicing,
@@ -150,12 +153,18 @@ const OrderPage = () =&gt; {
   const [currentPage, setCurrentPage] = useState(1);
   const [orderCheckType, setOrderCheckType] = useState('');
   const [filterCondifion, setFilterCondition] = useState(0);
-  const [mainOrderSelectedMap] = useState(new Map()); //选中的主订单Map
+  const [mainOrderSelectedMap] = useState(new Map()); //选中的主订单Map key：主订单id value：主订单数据
+  const [subOrderSelectedMap] = useState(new Map()); //选中的子订单Map key：主订单id value：选中的子订单数据集合
   const [mainOrderSelectedRows, setMainOrderSelectedRows] = useState([]); //选中的主订单集合
   const mainTableRef = useRef<ActionType>();
   const mainTableFormRef = useRef<ProFormInstance>();
   let [searchParams, setSearchParam] = useState(Object); //表格的查询条件存储
   const [messageApi, contextHolder] = message.useMessage();
+  const [
+    shippingWarehouseChangeModalVisible,
+    setShippingWarehouseChangeModalVisible,
+  ] = useState(false);
+  const [ids, setIds] = useState([]);
   const roleCode = userInfo?.roleSmallVO?.code;
  
   // const openCheckNotes = (checkNotes: string) => {
@@ -308,11 +317,11 @@ const OrderPage = () =&gt; {
   }
  
   const onCheckboxChange = (record: never) => {
+    console.log(subOrderSelectedMap);
     let newSelectedItems = [];
     if (selectedItems.includes(record.id)) {
       newSelectedItems = selectedItems.filter((key) => key !== record.id);
       setSelectedRowKeys([]);
-      console.log(selectedRowObj);
       setSelectedRowObj({
         ...setSelectedRowObj,
         [record.id]: [],
@@ -743,6 +752,26 @@ const OrderPage = () =&gt; {
             ) : (
               ''
             )}
+
+            {(roleCode === 'warehouseKeeper' || roleCode === 'admin') &&
+            optRecord.shippingWarehouse !== null ? (
+              <div
+                className="overflow-hidden whitespace-no-wrap overflow-ellipsis"
+                title={enumValueToLabel(
+                  optRecord.shippingWarehouse,
+                  SHIPPING_WAREHOUSE_OPTIONS,
+                )}
+              >
+                <span className="text-slate-700">
+                  {enumValueToLabel(
+                    optRecord.shippingWarehouse,
+                    SHIPPING_WAREHOUSE_OPTIONS,
+                  )}
+                </span>
+              </div>
+            ) : (
+              ''
+            )}
           </Flex>
  
           <Flex className="w-[10%]" vertical gap="small">
@@ -827,6 +856,22 @@ const OrderPage = () =&gt; {
               ''
             )}
  
+            {optRecord.subPath?.includes('shippingWarehouseChangeRequest') ? (
+              <Button
+                className="p-0"
+                type="link"
+                onClick={() => {
+                  setIds([optRecord.id]);
+                  setOrderRow(optRecord);
+                  setShippingWarehouseChangeModalVisible(true);
+                }}
+              >
+                修改仓库
+              </Button>
+            ) : (
+              ''
+            )}
+
             {optRecord.subPath?.includes('saleCancelInvoicing') ? (
               <ButtonConfirm
                 className="p-0"
@@ -2458,6 +2503,40 @@ const OrderPage = () =&gt; {
     });
   }
  
+  /**
+   * 采购可以筛选其他采购
+   */
+  if (roleCode === 'procure' || roleCode === 'admin') {
+    mainOrdersColumns.push({
+      title: '采购名称',
+      width: 120,
+      dataIndex: 'supplierName',
+      valueType: 'select',
+      request: async () => {
+        const res = await postServiceOrderProvideProcurementRoles();
+        let options = res.data?.map((item) => {
+          return { label: item, value: item };
+        });
+        return options;
+      },
+      hideInTable: true,
+    });
+  }
+
+  /**
+   * 仓库可以筛选发货仓库
+   */
+  if (roleCode === 'warehouseKeeper' || roleCode === 'admin') {
+    mainOrdersColumns.push({
+      title: '发货仓库',
+      width: 120,
+      dataIndex: 'shippingWarehouse',
+      valueType: 'select',
+      valueEnum: enumToProTableEnumValue(SHIPPING_WAREHOUSE_OPTIONS),
+      hideInTable: true,
+    });
+  }
+
   //判断是否是采购，是的话新增一个筛选条件
   if (roleCode === 'procure' || roleCode === 'admin') {
     mainOrdersColumns.push({
@@ -2731,7 +2810,6 @@ const OrderPage = () =&gt; {
     //   </Button>,
     // );
  
-    console.log(toolBtns);
     return toolBtns;
   }
  
@@ -3150,6 +3228,20 @@ const OrderPage = () =&gt; {
         />
       )}
  
+      {shippingWarehouseChangeModalVisible && (
+        <ShippingWarehouseChangeModal
+          setVisible={setShippingWarehouseChangeModalVisible}
+          subOrderIds={ids}
+          originShippingWarehouse={orderRow?.shippingWarehouse}
+          onClose={() => {
+            setShippingWarehouseChangeModalVisible(false);
+            setOrderRow({});
+            setIds([]);
+            refreshTable();
+          }}
+        />
+      )}
+
       {contextHolder}
     </PageContainer>
   );
@@ -1458,6 +1458,11 @@ export interface ServerResult {
   result?: number;
 }
  
+export interface ShippingWarehouseChangeDto {
+  ids?: Array<number>;
+  shippingWarehouse?: string;
+}
+
 export interface SysLogQueryVO {
   address?: string;
   browser?: string;
@@ -63,6 +63,7 @@ import type {
   SalOrderSaveDto,
   SaveReply,
   ServerResult,
+  ShippingWarehouseChangeDto,
   SysLogQueryVO,
   SystemCustomFieldReq,
   UnitMaterialUnitListReq,
@@ -9520,6 +9521,77 @@ export const postServiceOrderSendProduct = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
  
+/** @description request parameter type for postServiceOrderShippingWarehouseChange */
+export interface PostServiceOrderShippingWarehouseChangeOption {
+  /**
+   * @description
+   *   dto
+   */
+  body: {
+    /**
+        @description
+          dto */
+    dto: ShippingWarehouseChangeDto;
+  };
+}
+
+/** @description response type for postServiceOrderShippingWarehouseChange */
+export interface PostServiceOrderShippingWarehouseChangeResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceOrderShippingWarehouseChangeResponseSuccess =
+  PostServiceOrderShippingWarehouseChangeResponse[200];
+/**
+ * @description
+ *   修改发货仓库
+ * @tags 内部订单
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceOrderShippingWarehouseChange = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/service/order/shippingWarehouseChange';
+  function request(
+    option: PostServiceOrderShippingWarehouseChangeOption,
+  ): Promise<PostServiceOrderShippingWarehouseChangeResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostServiceOrderShippingWarehouseChangeResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description request parameter type for postServiceOrderSupplierPrint */
 export interface PostServiceOrderSupplierPrintOption {
   /**