feat: 时效2.0开发

src/pages/AfterSaleManage/Pending/index.jsx

 import React, { useState, useRef } from 'react';
 import { notification, Button } from 'antd';
 import ProTable from '@ant-design/pro-table';
+import moment from 'moment';
+import _ from 'lodash';
 import { searchList, auditInfoApi, orderDetail } from '../services';
 import { columnSticData, appealType } from '../data';
 import AuditModal from '../components/auditModal';
@@ -19,6 +21,8 @@ export default () => {
   const [auditInfo, setAuditInfo] = useState({});
   const [appealDetailModal, setAppealDetailModal] = useState(false);
   const [selectedRow, setSelectedRow] = useState({});
+  const [timeString, setTimeString] = useState({});
+  const [time, setTime] = useState({});
 
   const viewDetail = async ({ serviceNo }) => {
     const data = await orderDetail({ serviceNo });
@@ -53,12 +57,58 @@ export default () => {
     setAppealDetailModal(true);
     setSelectedRow(detailData);
   };
+  const renderContent = (record, index, action) => {
+    if (!time[record.orderId]) {
+      const serviceTime = moment(record.serviceTime).valueOf() + 24 * 3600 * 1000;
+      const nowTime = moment(record.nowTime).valueOf();
+      let timeNumber = (serviceTime - nowTime) / 1000;
+      time[record.orderId] = setInterval(() => {
+        if (timeNumber > 0) {
+          timeNumber -= 1;
+          // eslint-disable-next-line radix
+          const hours = parseInt((timeNumber / 3600) % 24)
+            .toString()
+            .padStart(2, '0');
+          // eslint-disable-next-line radix
+          const minutes = parseInt((timeNumber / 60) % 60)
+            .toString()
+            .padStart(2, '0');
+          // eslint-disable-next-line radix
+          const seconds = parseInt(timeNumber % 60)
+            .toString()
+            .padStart(2, '0');
+          const str = `${hours}时${minutes}分${seconds}秒`;
+          timeString[record.orderId] = str;
+          const strings = _.cloneDeep(timeString);
+          setTimeString(strings);
+        } else {
+          clearInterval(time[record.orderId]);
+          timeString[record.orderId] = '0时0分0秒';
+          const strings = _.cloneDeep(timeString);
+          setTimeString(strings);
+        }
+      }, 1000);
+    }
+  };
   const columns = [
+    {
+      title: '审核倒计时',
+      dataIndex: 'serviceTime',
+      key: 'serviceTime',
+      hideInSearch: true,
+      width: 120,
+      render: (val, record, index, action) => [
+        <span style={{ color: 'red' }}>
+          {renderContent(record, index, action)}
+          {timeString[record.orderId]}
+        </span>,
+      ],
+    },
     {
       title: '售后状态',
       dataIndex: 'serviceStatus',
       hideInSearch: true,
-      width: 100,
+      width: 120,
     },
     ...columnSticData,
     {
@@ -66,7 +116,7 @@ export default () => {
       dataIndex: 'proofs',
       hideInSearch: true,
       width: 100,
-      render: (_, r) => <a onClick={() => viewProofs(r.proofs)}>查看凭证</a>,
+      render: (val, r) => <a onClick={() => viewProofs(r.proofs)}>查看凭证</a>,
     },
     {
       title: '售后申诉',
@@ -87,7 +137,7 @@ export default () => {
       dataIndex: 'action',
       width: 250,
       fixed: 'right',
-      render: (_, r) => [
+      render: (val, r) => [
         <Button key="link1" onClick={() => openAudit(r)} className="mr10" type="primary">
           审核
         </Button>,

src/pages/GoodsManage/SearchForm/index.jsx

-import { Form, Button, Input, Select, notification, Upload, Cascader, InputNumber } from 'antd';
+import {
+  Form,
+  Button,
+  Input,
+  Select,
+  notification,
+  Upload,
+  Cascader,
+  InputNumber,
+  Popover,
+  Divider,
+} from 'antd';
 import React, { Component } from 'react';
 import { connect } from 'dva';
 import styles from '../style.less';
@@ -53,6 +64,25 @@ class goodsManage extends Component {
     const selectW = { width: 250 };
     const iptNumWidth = { width: 118 };
     const that = this;
+    const content = (
+      <div>
+        <Button type="text" onClick={() => this.setArea(1, 'distribution')}>
+          全部商品配送区域设置
+        </Button>
+        <br />
+        <Button type="text" onClick={() => this.setArea(0, 'distribution')}>
+          勾选商品配送区域设置
+        </Button>
+        <br />
+        <Button type="text" onClick={() => this.setArea(1, 'after')}>
+          全部商品售后地址设置
+        </Button>
+        <br />
+        <Button type="text" onClick={() => this.setArea(0, 'after')}>
+          勾选商品售后地址设置
+        </Button>
+      </div>
+    );
     // const uploadProps = {
     //   name: 'file',
     //   async customRequest(info) {
@@ -138,15 +168,11 @@ class goodsManage extends Component {
           </Button>
         </FormItem>
         <FormItem style={{ float: 'right' }}>
-          <Button type="primary" className={styles.button} onClick={() => this.setArea(1)}>
-            全部配送不支持配置区域
-          </Button>
-          <Button type="primary" className={styles.button} onClick={() => this.setArea(0)}>
-            批量设置不支持配送区域
-          </Button>
-          <Button type="primary" className={styles.button}>
-            批量操作
-          </Button>
+          <Popover content={content} onVisibleChange={this.handleVisibleChange}>
+            <Button type="primary" className={styles.button}>
+              批量操作
+            </Button>
+          </Popover>
           <Button type="primary" className={styles.button} onClick={this.addSpu}>
             新增商品
           </Button>

src/pages/GoodsManage/TempleatModal/index.jsx

@@ -3,7 +3,7 @@ import '@ant-design/compatible/assets/index.css';
 import { Modal, Input, Select, Cascader, Tag, notification } from 'antd';
 import { da } from 'date-fns/locale';
 import React, { useState, useEffect } from 'react';
-import { getTemplate } from '../service';
+import { getTemplate, getAfterAddress } from '../service';
 
 const { Option } = Select;
 
@@ -14,6 +14,7 @@ const TempleatModal = props => {
     selectedRowKeys,
     templateList,
     isALL,
+    isType,
   } = props;
   const formItemLayout = {
     labelCol: {
@@ -24,27 +25,62 @@ const TempleatModal = props => {
     },
   };
   const handleOk = async () => {
-    console.log(props);
     validateFields(async (error, fieldsValue) => {
       if (!error) {
-        const data = await getTemplate({
-          isAll: isALL,
-          skuIdList: selectedRowKeys,
-          templateId: fieldsValue.templateId.key,
-        });
-        if (data.businessCode === '0000') {
-          notification.success({ message: '配置成功！' });
-          resetFields();
-          props.onCancel();
+        if (isType === 'distribution') {
+          this.setAfterAddress(fieldsValue);
+        }
+        if (isType === 'after') {
+          this.setTemplate(fieldsValue);
         }
       }
     });
   };
+  const setAfterAddress = async fieldsValue => {
+    const data = await getAfterAddress({
+      // isAll: isALL,
+      skuIds: selectedRowKeys,
+      afterAddressId: fieldsValue.templateId.key,
+    });
+    if (data.businessCode === '0000') {
+      notification.success({ message: '配置成功！' });
+      resetFields();
+      props.onCancel();
+    }
+  };
+  const setTemplate = async fieldsValue => {
+    const data = await getTemplate({
+      isAll: isALL,
+      skuIdList: selectedRowKeys,
+      templateId: fieldsValue.templateId.key,
+    });
+    if (data.businessCode === '0000') {
+      notification.success({ message: '配置成功！' });
+      resetFields();
+      props.onCancel();
+    }
+  };
+
+  const title = () => {
+    if (isType === 'distribution') {
+      if (isALL) {
+        return '全部商品配送区域设置';
+      }
+      return '勾选商品配送区域设置';
+    }
+    if (isType === 'after') {
+      if (isALL) {
+        return '全部设置不支持配送区域';
+      }
+      return '批量设置不支持配送区域';
+    }
+    return '';
+  };
 
   useEffect(() => {}, []);
   return (
     <Modal
-      title={isALL ? '全部设置不支持配送区域' : '批量设置不支持配送区域'}
+      title={title}
       visible={visible}
       width="500px"
       onCancel={props.onCancel}
@@ -57,11 +93,18 @@ const TempleatModal = props => {
             rules: [{ required: true, message: '请选择模板!' }],
           })(
             <Select placeholder="请选择模板" labelInValue allowClear>
-              {templateList.map(item => (
-                <Option label={item.templateName} value={item.id} key={item.id}>
-                  {item.templateName}
-                </Option>
-              ))}
+              {isType === 'after' &&
+                templateList.map(item => (
+                  <Option label={item.templateName} value={item.id} key={item.id}>
+                    {item.templateName}
+                  </Option>
+                ))}
+              {isType === 'distribution' &&
+                templateList.map(item => (
+                  <Option label={item.addressName} value={item.id} key={item.id}>
+                    {item.addressName}
+                  </Option>
+                ))}
             </Select>,
           )}
         </Form.Item>

src/pages/GoodsManage/createModal/index.jsx

@@ -30,7 +30,14 @@ import {
   validateSpuInfo,
   createEditData,
 } from './mixin';
-import { getSpecList, getJdPicList, getBrandList, addGoods, editGoods } from '../service';
+import {
+  getSpecList,
+  getJdPicList,
+  getBrandList,
+  addGoods,
+  editGoods,
+  getAfterAddress,
+} from '../service';
 import styles from '../style.less';
 import Upload from '../../components/sortablUpload';
 import BatchSetting from './batchSetting';
@@ -60,17 +67,31 @@ class goodsManage extends Component {
     skuNameVisible: false,
     productType: 1,
     confirmLoading: false,
+    afterAddressList: {},
   };
 
   componentDidMount() {
     this.getSpecData();
     this.getBrandData();
+    this.getAfterAddressData();
   }
 
   componentWillReceiveProps() {
     this.setState({ isCancel: false });
   }
 
+  // 获取售后地址
+  getAfterAddressData = async () => {
+    try {
+      const { data } = await getAfterAddress();
+      if (data) {
+        this.setState({ afterAddressList: data });
+      }
+    } catch (e) {
+      console.log(e);
+    }
+  };
+
   // 获取规格列表
   getSpecData = async () => {
     try {
@@ -497,7 +518,14 @@ class goodsManage extends Component {
       labelCol: { span: 2 },
       wrapperCol: { span: 22 },
     };
-    const { colorImg, productType, normalBrandList, brandList, confirmLoading } = this.state;
+    const {
+      colorImg,
+      productType,
+      normalBrandList,
+      brandList,
+      confirmLoading,
+      afterAddressList,
+    } = this.state;
     const skuSpeFirstKeys = initData.firstSpecList || [];
     const skuSpeSecondKeys = initData.secondSpecList || [];
     const treeDataArray = productType === 2 ? virtualTreeData : treeData;
@@ -655,6 +683,28 @@ class goodsManage extends Component {
                     )}
                   </FormItem>
                 </Col>
+                <Col span={10}>
+                  <FormItem label="售后地址" {...formItemLayout}>
+                    {getFieldDecorator('afterAddressId', {
+                      initialValue: this.state.initForm.afterAddressId,
+                      rules: [
+                        {
+                          required: true,
+                          message: '请选择售后地址',
+                        },
+                      ],
+                    })(
+                      <Select allowClear style={{ width: 280 }} placeholder="请选择售后地址">
+                        {afterAddressList?.length &&
+                          afterAddressList.map(item => (
+                            <Option key={item.id} value={item.id}>
+                              {item.addressName}
+                            </Option>
+                          ))}
+                      </Select>,
+                    )}
+                  </FormItem>
+                </Col>
                 {specListData.length
                   ? specListData.map((item, index) => (
                       <Col span={24}>

src/pages/GoodsManage/index.jsx

@@ -11,7 +11,14 @@ import LocalStroage from '@/utils/localStorage';
 import configApi from '../../../config/env.config';
 import UpdateStock from './UpdateStock';
 
-import { spuDetail, categoryList, getVirtualCategory, getTemplateList, specList } from './service';
+import {
+  spuDetail,
+  categoryList,
+  getVirtualCategory,
+  getTemplateList,
+  specList,
+  queryAllAfterAddress,
+} from './service';
 import LogModal from './LogModal';
 import CreateModal from './createModal';
 import { column, JDSHOPID } from './staticdata';
@@ -40,6 +47,7 @@ class goodsManage extends Component {
     selectedRowKeys: [],
     isAll: 0,
     templateList: [],
+    isType: '',
   };
 
   currentLog = null;
@@ -187,12 +195,13 @@ class goodsManage extends Component {
     });
   };
 
-  setArea = async isAll => {
+  setArea = async (isAll, type) => {
+    // distribution配送区域  after售后地址
     if (!this.state.selectedRowKeys.length && !isAll) {
       notification.error({ message: '请选择商品' });
       return;
     }
-    const data = await getTemplateList();
+    const data = type === 'distribution' ? await getTemplateList() : await queryAllAfterAddress();
     if (data.code === '0000' && data.data.length) {
       this.setState({
         templeatModalVisible: true,
@@ -303,7 +312,7 @@ class goodsManage extends Component {
               treeData={this.state.treeData}
               shopList={this.shopList}
               addSpu={() => this.setState({ createVisible: true, initData: {} })}
-              setArea={isALL => this.setArea(isALL)}
+              setArea={(isALL, type) => this.setArea(isALL, type)}
             />
           </Card>
           <Spin spinning={this.state.loading}>
@@ -384,6 +393,7 @@ class goodsManage extends Component {
               this.handleSearch();
             }}
             isALL={this.state.isAll}
+            isType={this.state.isType}
             templateList={this.state.templateList}
           />
         </Spin>

src/pages/GoodsManage/service.js

@@ -179,3 +179,13 @@ export async function queryAllAfterAddress() {
     prefix: goodsApi,
   });
 }
+
+// 商品售后地址设置
+export async function getAfterAddress(params) {
+  const data = await request.post('/product/api/updateSkuAfterAddress', {
+    data: stringify(params),
+    prefix: goodsApi,
+    headers,
+  });
+  return data;
+}

src/pages/cancelBillManage/Pending.jsx

@@ -5,12 +5,12 @@ import { Button, notification } from 'antd';
 import ProTable from '@ant-design/pro-table';
 import _ from 'lodash';
 // import { searchList, auditInfoApi, orderDetail } from './service';
+import moment from 'moment';
 import { searchList, orderDetail } from './service';
 import { column } from './data';
 import AuditModal from './components/auditModal';
 import DetailTable from './components/detailTable';
 import { dateDiff } from './common';
-import moment from 'moment';
 
 export default () => {
   const table = useRef();
@@ -104,6 +104,8 @@ export default () => {
           timeString[record.orderId] = '0时0分0秒';
           const strings = _.cloneDeep(timeString);
           setTimeString(strings);
+          // eslint-disable-next-line no-unused-expressions
+          table.current?.reload?.();
         }
       }, 1000);
     }