Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev

config/routes/handlingRoute.ts

@@ -38,7 +38,7 @@ const HandlingRoute = {
           icon: 'smile',
           component: '@/pages/handling/components/Query'
         },
-        // 指派生产通知单 -> 新增成产通知单（新建） 
+        // 指派生产通知单 -> 新增成产通知单（新建）
         {
           path: '/memberCenter/handling/assign/tobeAddQuery/add',
           name: 'assignProductionAdd',
@@ -105,6 +105,13 @@ const HandlingRoute = {
           component: '@/pages/handling/assign/processStock',
           // hideInMenu: true
         },
+        {
+          path: '/memberCenter/handling/assign/pendingAddProcessing/detail',
+          name: 'processStockDetail',
+          icon: 'smile',
+          component: '@/pages/handling/assign/detail',
+          hideInMenu: true
+        },
         // 指派生产通知单 -> 待收货生产通知单
         {
           path: '/memberCenter/handling/assign/pendingReceive',
@@ -120,7 +127,7 @@ const HandlingRoute = {
           component: '@/pages/handling/assign/detail',
           hideInMenu: true,
         },
-       
+
       ]
     },
     // 确认生产通知单
@@ -253,9 +260,7 @@ const HandlingRoute = {
         },
       ]
     }
-  
-
   ]
 }
 
-export default HandlingRoute
\ No newline at end of file
+export default HandlingRoute

src/locales/zh-CN/menu.ts

@@ -467,6 +467,7 @@ export default {
   'menu.handling.assign.examineSecondDetail': '待审核生产通知单（二级）详情',
   'menu.handling.assign.toBeSubmit': '待提交生产通知单',
   'menu.handling.assign.processStock': '待新增加工入库单',
+  'menu.handling.assign.processStockDetail': '待新增加工入库单详情',
   'menu.handling.assign.toBeRecieve': '待收货生产通知单',
   'menu.handling.assign.createProcessStock': '新建加工入库单',
   'menu.handling.assign.pendingSubmitDetail': '待提交生产通知单详情',
@@ -592,7 +593,7 @@ export default {
   'menu.afterService.repairManage.repairPrConfirm': '待确认维修申请单',
   'menu.afterService.repairManage.repairPrConfirmDetail': '查看维修申请单',
   'menu.afterService.repairManage.verifyRepairPrConfirm': '审核维修申请单',
-  
+
   // 结算能力
   'menu.balance': '结算',
   'menu.balance.settleRules': '结算规则配置',
@@ -617,4 +618,4 @@ export default {
   'menu.balance.accountsReceivable.logisticsDetail': '物流通知单结算明细',
   'menu.balance.accountsReceivable.productNoticeSettlementDetail': '生产通知单结算明细',
   'menu.balance.accountsReceivable.invoice': '开票管理',
-};
\ No newline at end of file
+};

src/pages/handling/assign/add/index.tsx

@@ -162,7 +162,7 @@ const Add: React.FC<{}> = () => {
     })
     // 当物流为 物流时，那么填充
     onFieldMount$('receivefullAddress').subscribe((state) => {
-      PublicApi.getLogisticsReceiverAddressPage({current: '1', pageSize: '10'})
+      PublicApi.getLogisticsReceiverAddressPage({current: '1', pageSize: '99'})
       .then((res) => {
         let options = [];
         if(res.code === 1000) {

src/pages/handling/assign/add/schema.tsx

@@ -124,7 +124,7 @@ const basicTab = {
               {
                 type: 'value:visible',
                 target: '*(receivefullAddress, receiveAddressID, receiveAddress,receiveUserName,receiveUserTel)',
-                condition: '{{$value == 1}}'
+                condition: '{{$value === 1}}'
               },
             ],
           },

src/pages/handling/assign/processStock/index.tsx

@@ -68,7 +68,7 @@ enum OuterAndInnerStatus {
   /**
    * 待新增加工入库单
    */
-  pending_add_process_in_warehouse = '6_18',
+  pending_add_process_in_warehouse = '6_19',
   /**
    * 待审核加工入库单
    */

src/pages/handling/common/index.tsx

@@ -19,7 +19,7 @@ export const docTime = [{label: '单据时间（全部）', value: 0}].concat(co
 /**
  * 下单时间
  */
-export const orderTime = [{label: '单据时间（全部）', value: 0}].concat(commonTimeList);
+export const orderTime = [{label: '订单时间（全部）', value: 0}].concat(commonTimeList);
 
 
 
@@ -70,7 +70,7 @@ export const CONFIRM_PENDING_CONFIRM_DETAIL = CONFIRM_PENDING_CONFIRM + DETAIL;
 export const QUERY_SEARCH_NAME = "noticeNo";
 
 /**
- * 指派生产通知单-待新增生产通知单列表页 
+ * 指派生产通知单-待新增生产通知单列表页
  */
 
 export const TO_BE_ADD_QUERY_SEARCH_NAME = "noticeNo";
@@ -142,6 +142,14 @@ export const ASSINGN_TITLE_MAPS = {
   [ASSIGN_PENDING_SUBMIT]: PENDING_SUBMIT_TITLE,
 }
 
+export const COMFIRM_TITLE_MAPS = {
+  [CONFIRM_QUERY]: '生产通知单查询',
+  [CONFIRM_PENDING_SUBMIT]: '待提交生产通知单',
+  [CONFIRM_PENDING_FIRST]: '待审核生产通知单（一级）',
+  [CONFIRM_PENDING_SECOND]: '待审核生产通知单（二级）',
+  [CONFIRM_PENDING_CONFIRM]: '待确认生产通知单'
+}
+
 
 
 // export const DETAIL_PATH = {
@@ -165,7 +173,7 @@ export const INNER_STATUS_BADGE_COLOR = {
 /**
  * 指派生产通知单-> 列表页 -> 内部状态： 只有四种装填：待审核， 待提交审核通知单- 审核不通过， 审核通过
  */
-// supplierInnerStatus, 
+// supplierInnerStatus,
 export const SUPPLIER_INNER_STATUS_COLOR = {
   "1": "default",
   "2": "warning",
@@ -214,7 +222,7 @@ export const CONFIRM_DETAIL_INNER_STATUS_COLOR = [
   "green",  // 完成
 ]
 
-type SUPPLIER_OUTER_STATUS_COLOR_TYPE = ("default" | "primary" | "danger"| "success" | "warning")[] 
+type SUPPLIER_OUTER_STATUS_COLOR_TYPE = ("default" | "primary" | "danger"| "success" | "warning")[]
 /**
  * 指派生产通知单 -> 列表页 -> 外部状态
  */
@@ -236,10 +244,10 @@ export const PROCESS_OUTER_STATUS_COLOR: ("default" | "processing" | "error"| "s
   "warning", // 待审核             processInnerStatus = 2,
   "error",  // 待审核(1级)        processInnerStatus = 3  不通过
   "success", // 待审核（2级）      processInnerStatus = 4  审核通过
-  "processing", // 待新增加工发货单   processInnerStatus = 5 
-  "warning", // 待审核加工发货单   processInnerStatus = 6 
+  "processing", // 待新增加工发货单   processInnerStatus = 5
+  "warning", // 待审核加工发货单   processInnerStatus = 6
   "default", // 待新增物流单       processInnerStatus = 7
-  "processing", // 待确认物流单        processInnerStatus = 8  
+  "processing", // 待确认物流单        processInnerStatus = 8
   "warning", // 待确认发货         processInnerStatus = 9
   "success", // 已确认发货          processInnerStatus = 10
   "default", // processInnerStatus = 11 待确认回单
@@ -316,7 +324,7 @@ export const DELIEVER_AND_RECEIVE_INNER_STATUS = {
   '5_1': 1,
   '5_2': 2,
   '7_1': 3,
-  '7_2': 4, 
-  '8_1': 5, 
+  '7_2': 4,
+  '8_1': 5,
   '8_2': 6
 }

src/pages/handling/components/EnterPrise/index.tsx

-import React, { useState } from 'react';
+import React, { useState, useCallback } from 'react';
 import { Modal} from 'antd';
 import { PublicApi } from '@/services/api';
 import EyePreview from '@/components/EyePreview';
@@ -7,14 +7,14 @@ import {  createAsyncFormActions, FormEffectHooks } from '@formily/antd';
 import { useRowSelectionTable } from '@/hooks/useRowSelectionTable';
 import { schema } from './schema';
 const actions = createAsyncFormActions();
-const { onFieldInit$ } = FormEffectHooks
+const { onFieldInit$, onFieldMount$ } = FormEffectHooks
 
 const EnterPrise = ({visible, cancel, ...restProps}) => {
   const [selectRow, memberRowCtl] = useRowSelectionTable({ customKey: 'memberId', type: 'radio' });
-  const fetchData = async (params: any) => {
+  const fetchData = useCallback(async (params: any) => {
     let res = await PublicApi.getMemberManageLowerPageBynamerole(params);
     return res;
-  };
+  }, []);
 
   const onOk = () => {
     restProps.onOk(memberRowCtl)
@@ -22,6 +22,7 @@ const EnterPrise = ({visible, cancel, ...restProps}) => {
   }
 
   const effects = () => {
+    // 使用onFieldMount 会执行两次，暂时不知道为什么
     onFieldInit$('roleId').subscribe((fieldState) => {
       PublicApi.getMemberManageRoleSubList().then(res => {
         let options = []
@@ -35,7 +36,6 @@ const EnterPrise = ({visible, cancel, ...restProps}) => {
     })
   }
 
-
   return (
     <Modal
       title="选择加工企业"
@@ -44,14 +44,17 @@ const EnterPrise = ({visible, cancel, ...restProps}) => {
       onCancel={cancel}
       onOk={onOk}
     >
-      <SearchForm
-        request={fetchData}
-        schema={schema}
-        actions={actions}
-        effects={effects}
-        expressionScope={{rowSelection: selectRow}}
-      ></SearchForm>
-
+      {
+        visible
+        ? <SearchForm
+            request={fetchData}
+            schema={schema}
+            actions={actions}
+            effects={effects}
+            expressionScope={{rowSelection: selectRow}}
+        ></SearchForm>
+        : null
+      }
     </Modal>
   )
 }

src/pages/handling/components/EnterPrise/schema.tsx

@@ -19,7 +19,7 @@ const columns = [
     title: '会员等级',
     dataIndex: 'levelTag'
   }
-] 
+]
 
 export const schema = {
   type: 'object',
@@ -98,7 +98,7 @@ export const schema = {
                     }
                   }
                 },
-                
+
                 queryBtn: {
                   type: 'string',
                   'x-component': 'Submit',
@@ -106,7 +106,7 @@ export const schema = {
                     "children": "查询",
                   }
                 }
-              } 
+              }
             }
           }
         },
@@ -138,4 +138,4 @@ export const schema = {
       }
     },
   }
-}
\ No newline at end of file
+}

src/pages/handling/components/ModalForTable/SearchForm.tsx

@@ -104,4 +104,4 @@ const SearchForm = (props) => {
   )
 }
 
-export default SearchForm
\ No newline at end of file
+export default SearchForm

src/pages/handling/components/ProcessOrder/index.tsx

@@ -23,16 +23,6 @@ const expandRowColumn = [
 
 
 const ProcessProducts = ({visible, cancel, rowSelection, ...restProps}) => {
-  // const [mainTableSelectRow, mainTableSelectRowCtl] = useRowSelectionTable({customKey: 'id'});
-  const [selectRow, selectRowCtl] = useRowSelectionTable({
-    customKey: 'fullId',
-    extendsSelection: {
-      getCheckboxProps: record => ({
-        disabled: record.purchaseCount - (record.processNum || 0) <= 0,
-      }),
-    }
-  });
-
   const fetchData = useCallback(async (params: any) => {
     const {orderTime, ...rest} = params
     const {st, et} = timeRange(orderTime);
@@ -85,12 +75,8 @@ const ProcessProducts = ({visible, cancel, rowSelection, ...restProps}) => {
     },
     // defaultExpandAllRows: true
   }
-  // console.log("rowSelection",rowSelection);
 
   const handleSubmit = () => {
-    // console.log(selectRowCtl, mainTableSelectRowCtl);
-    // console.log(selectRowCtl)
-    // restProps.onOk(selectRowCtl)
     restProps.onOk()
     cancel();
   }
@@ -117,16 +103,21 @@ const ProcessProducts = ({visible, cancel, rowSelection, ...restProps}) => {
         </div>
       }
     >
-      <SearchForm
-        request={fetchData}
-        components={{Table}}
-        schema={schema}
-        actions={actions}
-        expressionScope={{
-          // rowSelection: tableSelectRow(),
-          expandable: expandable
-        }}
-      ></SearchForm>
+      {
+        visible
+        ? <SearchForm
+            request={fetchData}
+            components={{Table}}
+            schema={schema}
+            actions={actions}
+            expressionScope={{
+              // rowSelection: tableSelectRow(),
+              expandable: expandable
+            }}
+          ></SearchForm>
+        : null
+      }
+
     </Drawer>
   )
 }

src/pages/handling/components/ProcessOrder/schema.tsx

@@ -21,7 +21,7 @@ const columns = [
       return ORDER_TYPE[text];
     }
   }
-] 
+]
 
 export const schema = {
   type: 'object',
@@ -96,11 +96,11 @@ export const schema = {
                     }
                   }
                 },
-                supplyMembersId: {
+                supplyMembersName: {
                   type: 'string',
-                  'x-component': 'Select',
+                  'x-component': 'Input',
                   'x-component-props': {
-                    placeholder: '请选择采购会员',
+                    placeholder: '请填写采购会员',
                     allowClear:true,
                     style: {
                       width: '150px',
@@ -150,7 +150,7 @@ export const schema = {
                     "children": "查询",
                   }
                 }
-              } 
+              }
             }
           }
         },
@@ -183,4 +183,4 @@ export const schema = {
       }
     },
   }
-}
\ No newline at end of file
+}

src/pages/handling/confirm/Query/index.tsx

@@ -19,7 +19,8 @@ import {
   CONFIRM_PENDING_SECOND,
   CONFIRM_PENDING_CONFIRM,
   SUPPLIER_OUTER_STATUS_COLOR,
-  PROCESS_OUTER_STATUS_COLOR
+  PROCESS_OUTER_STATUS_COLOR,
+  COMFIRM_TITLE_MAPS
 } from '../../common'
 
 import { timeRange } from '@/utils';
@@ -214,7 +215,7 @@ const Query: React.FC<{}> = (props) => {
 
   return (
     <PageHeaderWrapper
-      title={'生产通知单查询'}
+      title={COMFIRM_TITLE_MAPS[pathname] || '生产通知单查询'}
     >
       <Card>
         <StandardTable

src/pages/handling/confirm/Query/schema.tsx

@@ -205,8 +205,8 @@ export const pendingFirstQuerySchema: ISchema = {
             },
             docTime: {
               type: 'string',
-              default: undefined,
-              enum: [],
+              default: 0,
+              enum: docTime,
               'x-component-props': {
                 placeholder: '单据时间(全部)',
                 allowClear: true,

src/pages/user/register.tsx

@@ -51,9 +51,7 @@ const useLinkageValidateEffects = () => {
         countryCode: prefixCode,
         phone: fieldState.value
       }, { ctlType: 'none', useCache: true, ttl: 60 * 1000 }).then(({ code, data }) => {
-        if (code === 1000) {
-
-        } else {
+        if (code !== 1000) {
           setFieldState('phone', state => {
             state.errors = ['手机号已存在']
           })
@@ -61,19 +59,10 @@ const useLinkageValidateEffects = () => {
       })
     }
   })
-  onFieldValueChange$('*(password,confirmPassword)').subscribe(fieldState => {
-    const selfName = fieldState.name
+  onFieldValueChange$('*(confirmPassword)').subscribe(fieldState => {
     const selfValue = fieldState.value
-    const otherName = selfName == 'password' ? 'confirmPassword' : 'password'
-    const otherValue = getFieldState(otherName, state => state.value)
-    setFieldState(otherName, state => {
-      if (selfValue && otherValue && selfValue !== otherValue) {
-        state.errors = ['两次密码输入不一致']
-      } else {
-        state.errors = ['']
-      }
-    })
-    setFieldState(selfName, state => {
+    const otherValue = getFieldState('password', state => state.value)
+    setFieldState('confirmPassword', state => {
       if (selfValue && otherValue && selfValue !== otherValue) {
         state.errors = ['两次密码输入不一致']
       } else {
@@ -81,6 +70,26 @@ const useLinkageValidateEffects = () => {
       }
     })
   })
+  // onFieldValueChange$('*(password,confirmPassword)').subscribe(fieldState => {
+  //   const selfName = fieldState.name
+  //   const selfValue = fieldState.value
+  //   const otherName = selfName == 'password' ? 'confirmPassword' : 'password'
+  //   const otherValue = getFieldState(otherName, state => state.value)
+  //   setFieldState(otherName, state => {
+  //     if (selfValue && otherValue && selfValue !== otherValue) {
+  //       state.errors = ['两次密码输入不一致']
+  //     } else {
+  //       state.errors = ['']
+  //     }
+  //   })
+  //   setFieldState(selfName, state => {
+  //     if (selfValue && otherValue && selfValue !== otherValue) {
+  //       state.errors = ['两次密码输入不一致']
+  //     } else {
+  //       state.errors = ['']
+  //     }
+  //   })
+  // })
 }
 
 let timeChange: any;  // 定时器

src/pages/user/schema/index.ts

@@ -80,10 +80,10 @@ export const registerStep0Schema: ISchema = {
               required: true,
               message: '请输入密码'
             },
-            {
-              pattern: PATTERN_MAPS.password,
-              message: '请输入正确的密码'
-            }
+            // {
+            //   pattern: PATTERN_MAPS.password,
+            //   message: '请输入正确的密码'
+            // }
           ],
           "x-component-props": {
             type: 'password',

src/utils/index.tsx

@@ -96,12 +96,7 @@ export function timeRange(val: number) {
       ).valueOf();
       break;
     case 7:
-      st = moment(
-        moment()
-          .year(moment().year() - 1)
-          .startOf('year')
-          .format('YYYY-MM-DD HH:mm:ss'),
-      ).valueOf();
+      st = moment('1971-01-01', 'YYYY-MM-DD').valueOf(); // 或者0
       et = moment(
         moment()
           .year(moment().year() - 1)