refactor(access): 调整订单预警和客户管理权限

- 订单预警权限调整为 admin 和 sales - 客户管理权限调整为 admin、sales 和 warehouseKeeper - 重构部分组件代码，优化功能实现

refactor(access): 调整订单预警和客户管理权限
- 订单预警权限调整为 admin 和 sales - 客户管理权限调整为 admin、sales 和 warehouseKeeper - 重构部分组件代码，优化功能实现
曾国涛
1 parent 27b7cbf1
Showing 5 changed files with 8 additions and 27 deletions
.umirc.ts
src/access.ts
src/pages/Order/Order/components/AttachmentModal.tsx
src/pages/Order/Order/components/OrderDrawer copy.tsx
src/pages/Prepaid/components/RechargePrepaymentModal.tsx
@@ -51,6 +51,7 @@ export default defineConfig({
         {
           name: '订单预警',
           path: 'OrderWarning',
+          access: 'canReadAdminAndSales',
           component: './Order/OrderWarning',
         },
         {
@@ -143,7 +144,7 @@ export default defineConfig({
       name: '客户管理',
       path: '/Client',
       icon: 'BookOutlined',
-      access: 'canReadAdminAndSales',
+      access: 'canReadAdminAndSalesAndWarehouseKeeper',
       routes: [
         {
           name: '客户列表',
@@ -23,5 +23,7 @@ export default (initialState: API.UserInfo) =&gt; {
     canReadAdminAndWarehouseKeeperAndProcure:
       canReadWarehouseKeeper || canReadAdmin || canReadProcure,
     canReadAdminAndSalesManager: canReadAdmin || canReadSalesManager,
+    canReadAdminAndSalesAndWarehouseKeeper:
+      canReadAdmin || canReadSales || canReadWarehouseKeeper,
   };
 };
@@ -69,28 +69,6 @@ export default ({ data, onClose }) =&gt; {
       {newListAnnex?.length <= 0 ? (
         <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />
       ) : (
-        // <ProFormUploadDragger
-        //   name="listAnnex"
-        //   action="/api/service/order/fileProcess"
-        //   disabled
-        //   fieldProps={{
-        //     headers: { Authorization: localStorage.getItem('token') },
-        //     // onRemove: (file) => {
-        //     //   const index = fileList[listMeta.index].indexOf(file);
-        //     //   console.log(index);
-        //     //   const newFileList = fileList.slice();
-        //     //   newFileList.splice(index, 1);
-        //     //   setFileList(newFileList);
-        //     // },
-        //     // beforeUpload: (file) => {
-        //     //   fileList[listMeta.index] = [...fileList[listMeta.index], file as RcFile];
-        //     //   setFileList(fileList);
-        //     //   return true;
-        //     // },
-        //     fileList,
-        //     // defaultFileList: itemFileList
-        //   }}
-        // />
         <>
           <Card>
             <Image.PreviewGroup
@@ -10,6 +10,7 @@ import {
   postServiceOrderUpdateOrder,
 } from '@/services';
 import {
+  FloatAdd,
   enumToSelect,
   getAliYunOSSFileNameFromUrl,
   getUserInfo,
@@ -397,10 +398,8 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
     let totalPayment = 0;
     list?.forEach((subOrder: any) => {
       let subOrderPayment = subOrder?.subOrderPayment;
-      if (subOrderPayment === '' || subOrderPayment === undefined) {
-        totalPayment += 0;
-      } else {
-        totalPayment += subOrderPayment;
+      if (subOrderPayment !== '' || subOrderPayment !== undefined) {
+        totalPayment = FloatAdd(totalPayment, subOrderPayment);
       }
     });
     form.setFieldValue('totalPayment', totalPayment);
@@ -404,6 +404,7 @@ export default ({ setVisible, prepaymentObject, onClose }) =&gt; {
           name="phone"
           label="手机号"
           rules={[{ required: true, message: '请输入手机号' }]}
+          normalize={(value) => value && value.trim()}
         />
         <ProFormSelect
           name="salesCode"