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

src/locales/en-US/commodity.ts

@@ -1078,7 +1078,7 @@ export default {
   'commodity.checkProductDetail.card.title2': 'essential information',
   'commodity.checkProductDetail.card2.p.1': 'Product slogan:',
   'commodity.checkProductDetail.card2.p.2': 'Selling points:',
-  'commodity.checkProductDetail.card2.p.3': 'City of Ownership:',
+  'commodity.checkProductDetail.card2.p.3': 'Distribution area:',
   'commodity.checkProductDetail.card2.p.quanguo': 'nationwide',
   'commodity.checkProductDetail.card2.p.4': 'Shopping mall:',
   'commodity.checkProductDetail.card.title3': 'logistics information',

src/locales/ko-KR/commodity.ts

@@ -1079,7 +1079,7 @@ export default {
   'commodity.checkProductDetail.card.title2': '기본 정보',
   'commodity.checkProductDetail.card2.p.1': '상품표어:',
   'commodity.checkProductDetail.card2.p.2': '판매 포인트:',
-  'commodity.checkProductDetail.card2.p.3': '관할지시:',
+  'commodity.checkProductDetail.card2.p.3': '배송 지역:',
   'commodity.checkProductDetail.card2.p.quanguo': '전국',
   'commodity.checkProductDetail.card2.p.4': '오픈마켓:',
   'commodity.checkProductDetail.card.title3': '물류정보',

src/locales/zh-CN/commodity.ts

@@ -1076,7 +1076,7 @@ export default {
   'commodity.checkProductDetail.card.title2': '基本信息',
   'commodity.checkProductDetail.card2.p.1': '商品标语：',
   'commodity.checkProductDetail.card2.p.2': '商品卖点：',
-  'commodity.checkProductDetail.card2.p.3': '归属地市：',
+  'commodity.checkProductDetail.card2.p.3': '配送区域：',
   'commodity.checkProductDetail.card2.p.quanguo': '全国',
   'commodity.checkProductDetail.card2.p.4': '上架商城：',
   'commodity.checkProductDetail.card.title3': '物流信息',

src/pages/classAndProperty/attribute/index.tsx

@@ -193,7 +193,7 @@ const Attribute: React.FC<{}> = () => {
   ];
 
   const handleSee = (record) => {
-    history.push(`/memberCenter/commodityAbility/classAndProperty/attribute/detail?id=${record.id}&isSee=true`)
+    history.push(`/memberCenter/commodityAbility/classAndProperty/attribute/detail?id=${record.id}&isSee=true&isMultiple=${isMultiple}`)
   }
 
   const confirm = (record) => {

src/pages/classAndProperty/propertyValue/index.tsx

@@ -178,7 +178,7 @@ const PropertyValue: React.FC<{}> = () => {
   }
 
   const handleSee = (record: any) => {
-    history.push(`/memberCenter/commodityAbility/classAndProperty/propertyValue/detail?attrId=${selectKey}&attrName=${record.customerAttribute.name}&attrValueId=${record.id}&isSee=true&type=${record.type}`)
+    history.push(`/memberCenter/commodityAbility/classAndProperty/propertyValue/detail?attrId=${selectKey}&attrName=${record.customerAttribute.name}&attrValueId=${record.id}&isSee=true&type=${record.type}&isMultiple=${isMultiple}`)
   }
 
   const columns: ColumnType<any>[] = [

src/pages/commodity/products/addProducts.tsx

@@ -163,12 +163,17 @@ const AddProducts: React.FC<{}> = (props) => {
           )
         })
         Promise.all(data).then((values) => {
+          let _productSelectAttribute = []
           // 提交的数据进行处理
-          productSelectAttribute.length > 0 && productSelectAttribute.map(_itme => {
-            _itme.customerAttribute = { id: _itme.customerAttributeId }
-            delete _itme.attributeName
-            delete _itme.isPrice
-          })
+          if(productSelectAttribute.length) {
+            _productSelectAttribute = productSelectAttribute.map(_item => {
+              let obj = {..._item}
+              obj.customerAttribute = { id: obj.customerAttributeId }
+              delete obj.attributeName
+              delete obj.isPrice
+              return obj
+            })
+          }
           let _bacsicForm = { ...values[0] }
           if (values.length > 0) {
             for (let i = 0; i < values.length; i++) {
@@ -195,7 +200,7 @@ const AddProducts: React.FC<{}> = (props) => {
           }
           let _params = {
             ..._bacsicForm,
-            commodityAttributeList: productSelectAttribute,
+            commodityAttributeList: _productSelectAttribute,
             commodityRemark: _productDescription,
             isAllAttributePic: isAllAttributePic,
             isUpdateAttribute: true,
@@ -366,10 +371,6 @@ const AddProducts: React.FC<{}> = (props) => {
             setIsDisableSaveBtn(false)
             message.error(e.message || intl.formatMessage({ id: 'commodity.products.addProducts.onSave.error.2' }))
           }
-          // 新增不先填价格 清空属性form
-          if(childFormRefs.current[1].current.__INTERNAL__.name === 'attribute-form' && !productInfoByEdit) {
-            childFormRefs.current[1].current.resetFields()
-          }
           console.log(e, 'e')
         }).catch(error => {
           console.log(error, '_error')

src/pages/commodity/products/addProductsItem/priceAttributeForm.tsx

@@ -316,6 +316,7 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => {
     // 生成表格dataSource
     let combineArray = SKUCombine(_attributeValueArr)
     // console.log(combineArray, 'combineArray')
+
     setCombineAttributeArray(combineArray)
     setAttributeObjArr(_temp_attributeObjArr)
     setAttributeValObjArr(_temp_attributeValObjArr)

src/pages/transaction/dealAbility/inquiryOffer/preview/index.tsx

@@ -16,6 +16,7 @@ import EyePreview from '@/components/EyePreview';
 import { ENTERPRISE_CENTER_URL } from '@/constants';
 import { GlobalConfig } from '@/global/config';
 import { getTransactionProductInquiryDetails } from '@/services/TransactionV2Api';
+import { postManageWebShopWebAll } from '@/services/ManageV2Api';
 const intl = getIntl();
 const TABLINK = [
   { id: 'progressLayout', title: intl.formatMessage({id: 'dealAbility.liuzhuanjindu'}) },
@@ -42,13 +43,14 @@ const InquiryOfferPreview = () => {
   const [conditionEffect, setConditionEffect] = useState<any>([]);
   const [fileEffect, setFileEffect] = useState<any>([]);
 
-  const handleBasicEffect = (data: any) => {
+  const handleBasicEffect = (data: any, shopInfo: any[]) => {
+    console.log(data, shopInfo, 10086)
     setBasicEffect([
       {
         col: [
           { label: intl.formatMessage({id: 'dealAbility.xunjiadanhao'}), extra: data.inquiryListNo },
           { label: intl.formatMessage({id: 'dealAbility.xunjiazhaiyao'}), extra: data.details },
-          { label: intl.formatMessage({id: 'dealAbility.xunjiashangcheng'}), extra: GlobalConfig.web.shopInfo.map(item => {
+          { label: intl.formatMessage({id: 'dealAbility.xunjiashangcheng'}), extra: shopInfo.map(item => {
             if (item.id === data.shopId) {
               return item.name
             }
@@ -130,10 +132,22 @@ const InquiryOfferPreview = () => {
         return;
       }
       const { data } = res;
-      data.externalLogStates = [...data.externalInquiryListStateResponses];
-      data.externalLogs = [...data.externalInquiryListLogResponses];
+      data.externalLogStates = data.externalInquiryListStateResponses ? [...data.externalInquiryListStateResponses] : [];
+      data.externalLogs = data.externalInquiryListLogResponses ? [...data.externalInquiryListLogResponses] : [];
+      postManageWebShopWebAll({
+        siteId: GlobalConfig.global.siteInfo.id,
+        environment: 1,
+        hasMemberType: 1,
+        memberId: data.memberId,
+        roleId: data.memberRoleId,
+      }, {ctlType: 'none'}).then(res => {
+        if (res.code !== 1000) {
+          return
+        }
+        handleBasicEffect(data, res.data);
+      })
       setDataSource(data);
-      handleBasicEffect(data);
+      // handleBasicEffect(data);
       handleConditionEffect(data);
       handleFileEffect(data);
     }).catch(error => {

src/pages/transaction/dealAbility/productInquiry/detail/index.tsx

@@ -17,6 +17,7 @@ import ModalOperate from '@/pages/transaction/components/modalOperate';
 import { ENTERPRISE_CENTER_URL } from '@/constants';
 import EyePreview from '@/components/EyePreview';
 import { getTransactionInquiryListDetails, postTransactionInquiryDocumentsReview, postTransactionInquiryDocumentsReviewTwo } from '@/services/TransactionV2Api';
+import { postManageWebShopWebAll } from '@/services/ManageV2Api';
 const intl = getIntl();
 const TABLINK = [
   { id: 'progressLayout', title: intl.formatMessage({ id: 'dealAbility.liuzhuanjindu' }) },
@@ -45,14 +46,14 @@ const ProductInquiryDetail = () => {
   const [fileEffect, setFileEffect] = useState<any>([]);
   const [visible, setVisible] = useState<boolean>(false);
 
-  const handleBasicEffect = (data: any) => {
+  const handleBasicEffect = (data: any, shopInfo: any[]) => {
     setBasicEffect([
       {
         col: [
           { label: intl.formatMessage({ id: 'dealAbility.xunjiadanhao' }), extra: data.inquiryListNo },
           { label: intl.formatMessage({ id: 'dealAbility.xunjiazhaiyao' }), extra: data.details },
           {
-            label: intl.formatMessage({ id: 'dealAbility.xunjiashangcheng' }), extra: GlobalConfig.web.shopInfo.map(item => {
+            label: intl.formatMessage({ id: 'dealAbility.xunjiashangcheng' }), extra: shopInfo.map(item => {
               if (item.id === data.shopId) {
                 return item.name
               }
@@ -139,8 +140,20 @@ const ProductInquiryDetail = () => {
       data.interiorLogStates = data.interiorRequisitionFormStateResponses ? [...data.interiorRequisitionFormStateResponses] : null;
       data.externalLogs = data.externalInquiryListLogResponses ? [...data.externalInquiryListLogResponses] : null;
       data.interiorLogs = data.interiorInquiryListLogResponses ? [...data.interiorInquiryListLogResponses] : null;
+      postManageWebShopWebAll({
+        siteId: GlobalConfig.global.siteInfo.id,
+        environment: 1,
+        hasMemberType: 1,
+        memberId: data.memberId,
+        roleId: data.memberRoleId,
+      }, {ctlType: 'none'}).then(res => {
+        if (res.code !== 1000) {
+          return
+        }
+        handleBasicEffect(data, res.data);
+      })
       setDataSource(data);
-      handleBasicEffect(data);
+      // handleBasicEffect(data);
       handleConditionEffect(data);
       handleFileEffect(data);
     }).catch(error => {

src/store/product/index.ts

@@ -131,7 +131,6 @@ class ProductStore implements IProductModule {
 
   @action.bound
   public setProductSelectAttribute(list: any[]) {
-    // console.log(list, 'mobx')
     this.productSelectAttribute = list;
   }