Merge branch 'feature/20230327_public_takeaway' of...

Merge branch 'feature/20230327_public_takeaway' of http://git.quantgroup.cn/ui/merchant-manage-ui into feature/20230327_public_takeaway

src/app.js

 /* eslint-disable no-console */
 import * as Sentry from '@sentry/react';
 import localStorage from '@/utils/localStorage';
-// process.env.SENTRY_ENV !== 'test'  加上测试环境不会报错
 
-if (process.env.NODE_ENV === 'production' && process.env.SENTRY_ENV !== 'test') {
+if (process.env.NODE_ENV === 'production') {
   try {
     Sentry.init({
       dsn: 'https://b3f60c62e1234e26a5b851b9f26fba07@sentry.q-gp.com/34',

src/pages/GoodsManage/Takeaway/index.jsx

@@ -127,10 +127,11 @@ const Takeaway = options => {
     openModal('stock');
   };
   // 编辑
-  const onEdit = ({ spuId }) => {
+  const onEdit = ({ spuId, skuId }) => {
     options.handleEdit({
       shopId,
       spuId,
+      skuId,
     });
   };
   // 新建商品

src/pages/businessManage/info/index.jsx

@@ -362,6 +362,7 @@ class BusinessInfo extends Component {
                     <Checkbox.Group
                       options={businessModel}
                       onChange={e => this.onChangeBusinessModel(e)}
+                      disabled={+mainCategoryId === carID}
                     />,
                   )}
                 </FormItem>
@@ -807,7 +808,7 @@ class BusinessInfo extends Component {
                       </Col>
                       <Col span={5}>
                         <FormItem>
-                          {getFieldDecorator('legalPersonPeriod', {
+                          {getFieldDecorator('checked', {
                             initialValue: businessInfo.checked,
                           })(
                             <Checkbox.Group

src/pages/contractView/index.jsx

@@ -38,6 +38,25 @@ const ContractView = () => {
       key: 'signDate',
       align: 'center',
       hideInSearch: true,
+      render: (val, data) => {
+        if (val?.length) {
+          let date = '';
+          val.forEach((item, index) => {
+            if (item && item.toString().length === 1) {
+              item = `0${item}`;
+            }
+            if ([0, 1].includes(index)) {
+              date += `${item}-`;
+            } else if ([3, 4].includes(index)) {
+              date += `${item}:`;
+            } else {
+              date += `${item} `;
+            }
+          });
+          return date;
+        }
+        return '-';
+      },
     },
     {
       title: '合同状态',