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

src/locales/en-US/responseCode.ts

@@ -1139,5 +1139,7 @@ export default {
   "49114": "Sorting cannot be repeated",
   "49117": 'Sorting under the same recommendation label cannot be repeated',
   "21055": "The payment request amount of the document in the current payment request is greater than the remaining payment amount of the document",
-  "49116": "The sorting cannot be empty when the recommended label is selected"
+  "49116": "The sorting cannot be empty when the recommended label is selected",
+  "47034": "The deadline must be greater than the start time and greater than the current time",
+  "47035": "You can only modify the active page of 'to be online' or 'offline'",
 }

src/locales/ko-KR/responseCode.ts

@@ -1138,5 +1138,8 @@ export default {
   "49114": "정렬은 중복될 수 없습니다.",
   "49117": '같은 추천 탭 아래 정렬 중복 불가',
   "21055": "현재 청구서에 증빙서류가 존재하는 청구금액은 증빙서류의 남은 지불금액보다 크다",
-  "49116": "추천 태그를 선택한 경우 정렬이 비워둘 수 없습니다."
+  "49116": "추천 태그를 선택한 경우 정렬이 비워둘 수 없습니다.",
+  "47034": "마감 시간은 반드시 시작 시간보다 크고 현재 시간보다 커야 한다",
+  "47035": "온라인 또는 오프라인 상태의 활동 페이지만 수정할 수 있습니다.",
+  "47036": "'온라인 대기'이벤트 페이지만 삭제 가능",
 }

src/locales/zh-CN/responseCode.ts

@@ -1140,5 +1140,8 @@ export default {
   "49114": "排序不能重复",
   "49117": "同一推荐标签下排序不能重复",
   "21055": "当前请款单中存在单据的请款金额大于单据剩余支付金额",
-  "49116": "选择推荐标签的情况下排序不能为空"
+  "49116": "选择推荐标签的情况下排序不能为空",
+  "47034": "截止时间必须大于开始时间并且还要大于当前时间",
+  "47035": "只能修改'待上线'或'已下线'的活动页",
+  "47036": "只能删除'待上线'的活动页",
 }

src/pages/transaction/marketingAbility/marketingActivitiesManagement/activePage/add/index.tsx

@@ -66,6 +66,10 @@ const Add = () => {
 
   const [initialValue, setInitialValue] = useState<InitialValueType | null>(null);
   const [loading, setLoading] = useState<boolean>(false);
+  /**
+   * 只能修改待上线跟已下线的活动
+   */
+  const isDisabled = initialValue?.status === 2 || initialValue?.status === 3 || initialValue?.status === 5
 
   const onSubmit = async (values: SubmitType) => {
     const { template, startTime, endTime, ...rest } = values;
@@ -102,12 +106,13 @@ const Add = () => {
             history.push(`${rest.environment === WEB ? WEB_FIXTURE_LINK : APP_FIXTURE_LINK}?id=${data}`);
           },
           onCancel: () => {
+            // history.push('/memberCenter/marketingAbility/activityPages/management')
             history.goBack();
           }
         });
         return
       }
-      history.goBack();
+      // history.goBack();
     }
   };
 
@@ -183,7 +188,7 @@ const Add = () => {
       onBack={() => history.push('/memberCenter/marketingAbility/activityPages/management')}
       backIcon={<ReutrnEle />}
       extra={
-        !isView && (
+        !isView  && (
           <Space>
             {
               isEdit && (
@@ -193,7 +198,15 @@ const Add = () => {
               ) || null
             }
 
-            <Button icon={<SaveOutlined />} loading={loading} onClick={() => actions.submit()} type="primary">{intl.formatMessage({ id: 'activityPage.save' })}</Button>
+            <Button 
+              icon={<SaveOutlined />} 
+              loading={loading} 
+              onClick={() => actions.submit()} 
+              type="primary"
+              disabled={isDisabled}
+            >
+              {intl.formatMessage({ id: 'activityPage.save' })}
+            </Button>
           </Space>
         )
       }
@@ -231,7 +244,7 @@ const Add = () => {
               formAction.setFieldValue("shopName", target.label);
             });
           }}
-          editable={!isView}
+          editable={!isView || isDisabled}
           value={initialValue}
         />
       </div>

src/pages/transaction/purchaseOrder/orderCollectB2b/effects/index.ts

@@ -114,16 +114,16 @@ export interface JumpFormValueType {
 
 // 异步处理发货 预约时间 时间段配置
 export const useOrderDeliverTimeEffect = async (ctx: ISchemaFormActions | ISchemaFormAsyncActions, shopId, jumpFormValue: JumpFormValueType) => {
-  const { pageStatus } = usePageStatus()
+  const { pageStatus, quotationId } = usePageStatus()
   if(shopId) {
     let vendorMemberId, vendorRoleId;
-    if(pageStatus === PageStatus.ADD) {
-      vendorMemberId = ctx.getFieldValue('vendorMemberId')
-      vendorRoleId = ctx.getFieldValue('vendorRoleId')
-    } else if(pageStatus === PageStatus.EDIT) {
-      vendorMemberId = jumpFormValue.vendorMemberId
-      vendorRoleId = jumpFormValue.vendorRoleId
-    }
+    // if(pageStatus === PageStatus.ADD) {
+      vendorMemberId = ctx.getFieldValue('vendorMemberId') || jumpFormValue.vendorMemberId
+      vendorRoleId = ctx.getFieldValue('vendorRoleId') || jumpFormValue.vendorRoleId
+    // } else if(pageStatus === PageStatus.EDIT) {
+    //   vendorMemberId = jumpFormValue.vendorMemberId
+    //   vendorRoleId = jumpFormValue.vendorRoleId
+    // }
     console.log(vendorMemberId, vendorRoleId, 'jumpFormValue')
     const { code, data } = await getOrderBuyerFindDeliveryDate({shopId, vendorMemberId, vendorRoleId})
     if(code !== 1000) { return false; }

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

@@ -480,7 +480,7 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = () => {
               })
               // 供应商变动查询商城列表
               $('onFieldValueChange', 'vendorMemberId').subscribe(async state => {
-                const role = ctx.getFieldValue('vendorRoleId')
+                const role = ctx.getFieldValue('vendorRoleId') || jumpFormValueRef.current.vendorRoleId
                 const data = await fectchShopListsSource({
                   environment: 1,
                   hasMemberType: 1,