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

package.json

@@ -19,7 +19,8 @@
     "test": "umi-test",
     "test:coverage": "umi-test --coverage",
     "start:cross": "cross-env SITE_ID=352 yarn start",
-    "start:url": "cross-env SITE_ID=1 BACK_GATEWAY=http://lingxi-all.wg.shushangyun.com yarn start"
+    "start:url": "cross-env SITE_ID=1 BACK_GATEWAY=http://lingxi-all.wg.shushangyun.com yarn start",
+    "start:10": "cross-env SITE_ID=1 BACK_GATEWAY=http://10.0.0.10:8100 yarn start"
   },
   "lint-staged": {
     "*.{js,jsx,less,md,json}": [

src/pages/repositories/components/PositionSetting.tsx

@@ -170,8 +170,10 @@ const PositionSetting:React.FC<PositionSettingProps> = (props) => {
       message.error('请先选择商城类型')
       return false
     }
-    productRowCtl.setSelectedRowKeys([])
-    productRowCtl.setSelectRow([])
+
+    // fix: 选中后无法回显
+    // productRowCtl.setSelectedRowKeys([])
+    // productRowCtl.setSelectRow([])
     setVisibleChannelRroduct(true)
   }
   // 新增会员

src/pages/transaction/purchaseOrder/orderPreview/index.tsx

@@ -270,10 +270,10 @@ const CommonOrderDetail: React.FC<CommonOrderDetailProps> = (props) => {
             {pageStatus !== PageStatus.ADD && formData && <AuditProcess
               customTitleKey='operationalProcess'
               customKey='state'
-              outerVerifyCurrent={findLastIndexFlowState(formData.externalWorkflowFlowRecordLogResponses)}
-              innerVerifyCurrent={findLastIndexFlowState(formData.interiorWorkflowFlowRecordLogResponses)}
-              outerVerifySteps={formData.externalWorkflowFlowRecordLogResponses}
-              innerVerifySteps={formData.interiorWorkflowFlowRecordLogResponses}
+              outerVerifyCurrent={findLastIndexFlowState(formData.externalWorkflowFlowRecordLogResponses) || 0}
+              innerVerifyCurrent={findLastIndexFlowState(formData.interiorWorkflowFlowRecordLogResponses) || 0}
+              outerVerifySteps={formData.externalWorkflowFlowRecordLogResponses || []}
+              innerVerifySteps={formData.interiorWorkflowFlowRecordLogResponses || []}
             ></AuditProcess>}
 
             {/* 商品列表 */}

src/pages/transaction/saleOrder/orderPreview/index.tsx

@@ -252,10 +252,10 @@ const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => {
             { pageStatus !== PageStatus.ADD && formData && <AuditProcess 
               customTitleKey='operationalProcess'
               customKey='state'
-              outerVerifyCurrent={findLastIndexFlowState(formData.externalWorkflowFlowRecordLogResponses)} 
-              innerVerifyCurrent={findLastIndexFlowState(formData.interiorWorkflowFlowRecordLogResponses)} 
-              outerVerifySteps={formData.externalWorkflowFlowRecordLogResponses} 
-              innerVerifySteps={formData.interiorWorkflowFlowRecordLogResponses}
+              outerVerifyCurrent={findLastIndexFlowState(formData.externalWorkflowFlowRecordLogResponses) || 0} 
+              innerVerifyCurrent={findLastIndexFlowState(formData.interiorWorkflowFlowRecordLogResponses) || 0} 
+              outerVerifySteps={formData.externalWorkflowFlowRecordLogResponses || []} 
+              innerVerifySteps={formData.interiorWorkflowFlowRecordLogResponses || []}
             ></AuditProcess> }
 
             {/* 商品列表 */}

src/pages/transaction/saleOrder/utils/index.ts

@@ -24,6 +24,9 @@ export const changeRouterTitleByStatus = () => {
 
 // 找到最后一个可用的工作流状态的索引
 export const findLastIndexFlowState = (data: any[]) => {
+  if (!Array.isArray(data)) {
+    return 0
+  }
   for (let item = 0; item < data.length; item++) {
     if (data[item].isExecute === 0) {
       return item > 0 ? --item : 0