Merge branch 'featrue-pop' into 'master'

Featrue pop

See merge request !123

src/models/user.js

@@ -8,6 +8,7 @@ const UserModel = {
   state: {
     currentUser: {},
     homeInfo: {},
+    businessInfo: {},
   },
   effects: {
     // *fetch(_, { call, put }) {

src/pages/AfterSalesClaimForm/index.jsx

@@ -26,7 +26,7 @@ const AfterSalesClaimForm = ({ route }) => {
     collapsed: false,
     collapseRender: () => null,
   };
-
+  console.log('e11111111111!!!!!!!!!');
   const query = async params => {
     const { createdAt, singleType, singleNumber, current: pageNo, ...other } = params;
     const queryParams = { ...other, pageNo };

src/pages/AfterSalesClaimForm/staticdata.js

@@ -116,27 +116,35 @@ export const columnsConfig = props => [
   {
     title: '用户凭证',
     key: 'proof',
-    dataIndex: 'proof',
+    dataIndex: ['proof', 'userList'],
     align: 'center',
     width: 190,
     hideInSearch: true,
-    render: value =>
-      (value.userList || []).map(item => (
+    render: value => {
+      if (!Array.isArray(value) || value.length === 0) {
+        return value; // 呆萌兮兮地提示一下~
+      }
+      return value.map(item => (
         <ImageComponent style={{ paddingLeft: 5, marginTop: 5 }} key={item} width={50} src={item} />
-      )),
+      ));
+    },
   },
   {
     title: '审核意见',
     key: 'proof',
-    dataIndex: 'proof',
+    dataIndex: ['proof', 'csList'],
     align: 'center',
     width: 190,
     hideInSearch: true,
-    render: value =>
-      (value.csList || []).map(item => (
+    render: (value, record) => {
+      if (!Array.isArray(value) || value.length === 0) {
+        return value; // 呆萌兮兮地提示一下~
+      }
+      return (value || []).map(item => (
         <div style={csListStyle} onClick={() => props.downLoadFile(item)}>
           {item}
         </div>
-      )),
+      ));
+    },
   },
 ];

src/pages/GoodsManage/SearchForm/index.jsx

@@ -126,7 +126,7 @@ class goodsManage extends Component {
   };
 
   render() {
-    const { treeData, permissions } = this.props;
+    const { treeData, permissions, isPopMode } = this.props;
     const selectW = { width: 250 };
     const iptNumWidth = { width: 118 };
     const canEditable = permissions[GOOD_MANAGE.EDITABLE];
@@ -164,7 +164,7 @@ class goodsManage extends Component {
         className={styles.searchForm}
       >
         <FormItem label="SKU编码" name="skuId">
-          <InputNumber placeholder="请输入SKU编码" max={99999999999999999} style={selectW} />
+          <Input maxLength={18} showCount placeholder="请输入SKU编码" style={selectW} />
         </FormItem>
         <FormItem label="商品名称" name="skuName">
           <Input placeholder="请输入商品名称" allowClear style={selectW} />
@@ -242,7 +242,7 @@ class goodsManage extends Component {
               >
                 导出
               </Button>
-              {canEditable ? (
+              {canEditable && !isPopMode ? (
                 <FormItem style={{ float: 'right' }}>
                   <Popover content={content} onVisibleChange={this.handleVisibleChange}>
                     <Button type="primary" className={styles.button}>

src/pages/GoodsManage/index.jsx

@@ -32,9 +32,10 @@ import LocalStroage from '@/utils/localStorage';
 import configApi from '@/../config/env.config';
 import { GoldCategory } from '@/config/app.config';
 
-@connect(({ goodsManage, menu }) => ({
+@connect(({ goodsManage, menu, user }) => ({
   goodsManage,
   permissions: menu.permissions,
+  businessInfo: user.businessInfo,
 }))
 class goodsManage extends Component {
   state = {
@@ -77,6 +78,8 @@ class goodsManage extends Component {
 
   canEditable = false;
 
+  isPopMode = false;
+
   componentDidMount() {
     this.props.goodsManage.tableData = {};
     this.categoryList(this.state.productType);
@@ -250,6 +253,7 @@ class goodsManage extends Component {
   };
 
   onShowStockModal = async row => {
+    if (this.isPopMode) return;
     const res = await apiQueryLastChangeLog(row.skuId);
     let priceInfo = {
       id: row.skuId,
@@ -415,6 +419,7 @@ class goodsManage extends Component {
     const {
       goodsManage: { tableData = {} },
       permissions,
+      businessInfo,
     } = this.props;
     const rowSelection = {
       selectedRowKeys: this.state.selectedRowKeys,
@@ -426,6 +431,7 @@ class goodsManage extends Component {
     const canAddNormal = permissions[GOOD_MANAGE.ADD_NORMAL_GOODS];
     const canAddTakeaway = permissions[GOOD_MANAGE.ADD_TAKEAWAY_GOODS];
     this.canEditable = permissions[GOOD_MANAGE.EDITABLE];
+    this.isPopMode = businessInfo.supplierType === 'popBasic';
     // console.log('serviceData', this.state.serviceData);
     // console.log('shopList', this.shopList);
     // console.log('treeData', this.state.treeData);
@@ -445,19 +451,22 @@ class goodsManage extends Component {
               >
                 新增商品
               </Button>,
-              <Button
-                type="link"
-                key="btnDraft"
-                className={styles.button}
-                onClick={this.openDraftModal}
-              >
-                草稿箱
-              </Button>,
+              !this.isPopMode && (
+                <Button
+                  type="link"
+                  key="btnDraft"
+                  className={styles.button}
+                  onClick={this.openDraftModal}
+                >
+                  草稿箱
+                </Button>
+              ),
             ]
           : ''}
         <Spin spinning={this.state.createloading}>
           <Card>
             <SearchForm
+              isPopMode={this.isPopMode}
               handleSearch={this.handleSearch}
               onReset={this.onReset}
               onLoad={this.onLoad}

src/pages/GoodsManage/staticdata.js

@@ -46,6 +46,7 @@ export const productType = [
 
 export function column() {
   const onChangeState = async ({ skuId, state }) => {
+    if (this.isPopMode) return;
     confirm({
       icon: <ExclamationCircleOutlined />,
       content: `确认${+state === 6 ? '下架' : '上架'}商品？`,
@@ -61,6 +62,7 @@ export function column() {
     });
   };
   const onShowAudit = row => {
+    if (this.isPopMode) return;
     this.setState({
       auditRow: row,
       visibleAuditModal: true,
@@ -218,19 +220,21 @@ export function column() {
       align: 'center',
       render: (_, row) => (
         <div className={styles.actionBtn}>
-          {this.canEditable && (row.state === 4 || (row.state >= 5 && row.updateState !== 1)) && (
-            <Button
-              key="edit"
-              type="primary"
-              size="small"
-              className={styles.button}
-              onClick={() => {
-                this.serviceVisbleChange(row);
-              }}
-            >
-              修改
-            </Button>
-          )}
+          {this.canEditable &&
+            !this.isPopMode &&
+            (row.state === 4 || (row.state >= 5 && row.updateState !== 1)) && (
+              <Button
+                key="edit"
+                type="primary"
+                size="small"
+                className={styles.button}
+                onClick={() => {
+                  this.serviceVisbleChange(row);
+                }}
+              >
+                修改
+              </Button>
+            )}
           <Button
             key="viewP"
             type="primary"

src/pages/orderManage/queryOrder/components/DetailModal/index.jsx

@@ -76,8 +76,15 @@ const DetailModal = (props, ref) => {
     {
       title: '售后状态',
       width: 150,
-      dataIndex: 'afterServiceStatusDesc',
-      render: value => value || '-',
+      render: row => {
+        if (row.afterServiceStatusDesc) {
+          return row.afterServiceStatusDesc;
+        }
+        if (row.afterSaleVos && row.afterSaleVos.length) {
+          return row.afterSaleVos[0].afterServiceStatusDesc;
+        }
+        return '-';
+      },
     },
   ];
 
@@ -127,7 +134,7 @@ const DetailModal = (props, ref) => {
       receiverName,
       receiverMobile,
       fullAddress,
-      orderNo,
+      orderNoStr,
       orderTime,
       payTime,
     } = record;
@@ -138,7 +145,7 @@ const DetailModal = (props, ref) => {
       receiverName,
       receiverMobile,
       fullAddress,
-      orderNo,
+      orderNo: orderNoStr,
       orderTime,
       payTime,
     });