From 2d2e82995ec497dc3f922e4b4947e4c381148705 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E7=8E=89=E7=90=B3?= <1584592841@qq.com> Date: Sat, 16 Jul 2022 15:23:40 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8A=9E=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Accountant/OrderDetail.jsx | 20 +- src/components/Accountant/Query.jsx | 63 +++-- src/components/Accountant/WareIn.jsx | 225 ++++++++++++------ src/components/LoginReg/LoginCard.jsx | 24 +- src/components/System/AuthManage/Auth.jsx | 28 ++- src/components/System/Customer/Custom.jsx | 49 ++-- src/components/System/Employee/Employee.jsx | 45 +++- src/components/System/Order/EditOrder.jsx | 2 +- src/components/System/Order/Order.jsx | 43 +--- .../Ware/{WareCard.jsx => Position.jsx} | 75 +++--- ...ePositionDetail.jsx => PositionDetail.jsx} | 10 +- ...{WarePositionItem.jsx => PositionItem.jsx} | 4 +- src/components/System/Ware/WareInfo.jsx | 11 - src/components/System/Ware/WareManage.jsx | 64 +++-- src/components/index.js | 3 +- src/img/emptyPosition.png | Bin 0 -> 237362 bytes 16 files changed, 414 insertions(+), 252 deletions(-) rename src/components/System/Ware/{WareCard.jsx => Position.jsx} (72%) rename src/components/System/Ware/{WarePositionDetail.jsx => PositionDetail.jsx} (85%) rename src/components/System/Ware/{WarePositionItem.jsx => PositionItem.jsx} (83%) delete mode 100644 src/components/System/Ware/WareInfo.jsx create mode 100644 src/img/emptyPosition.png diff --git a/src/components/Accountant/OrderDetail.jsx b/src/components/Accountant/OrderDetail.jsx index c8a2b85..a4eed2e 100644 --- a/src/components/Accountant/OrderDetail.jsx +++ b/src/components/Accountant/OrderDetail.jsx @@ -4,46 +4,46 @@ import { orderType, orderStatus } from "../../utils/data"; const titles = [ { title: "单据号", - dataIndex: "id", + dataIndex: "orderId", }, { title: "订单拥有者", - dataIndex: "owner", + dataIndex: "orderOwner", }, { title: "货主IC卡号", - dataIndex: "buyer", + dataIndex: "orderBuyer", }, { title: "供应商IC卡号", - dataIndex: "seller", + dataIndex: "orderSeller", }, { title: "单据类型", - dataIndex: "type", + dataIndex: "orderType", }, { title: "力资费(元/吨)", - dataIndex: "amount", + dataIndex: "orderAmount", }, { title: "库存价(元/吨)", - dataIndex: "price", + dataIndex: "orderPrice", }, { title: "创建时间", - dataIndex: "time", + dataIndex: "orderCreatetime", }, { title: "单据状态", - dataIndex: "status", + dataIndex: "orderStatus", }, ]; const OrderDetail = ({ item }) => { const convertItem = { ...item, - key: item.id, + key: item.orderId, }; return (