chore: 修改评价相关接口

src/pages/transaction/purchaserEvaluation/common/schemas/evaluateSchema.tsx

@@ -2,7 +2,7 @@
  * @Author: XieZhiXiong
  * @Date: 2021-07-16 16:53:17
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2021-07-16 16:57:12
+ * @LastEditTime: 2021-08-09 16:18:13
  * @Description: 评价 schema
  */
 import { ISchema } from '@formily/antd';
@@ -39,23 +39,15 @@ export const evaluateSchema: ISchema = {
                 properties: {
                   star: {
                     title: '满意程度',
-                    required: true, 
                     'x-component': 'Rating', 
                     'x-component-props': {
                       allowHalf: false, 
                       allowClear: false, 
                     }, 
-                    'x-rules': [
-                      {
-                        required: true, 
-                        message: '请选择满意程度', 
-                      }, 
-                    ],
                   }, 
                   comment: {
                     type: 'string', 
                     title: '评价',
-                    required: true,
                     'x-component': 'TextArea', 
                     'x-component-props': {
                       rows: 4, 
@@ -92,7 +84,6 @@ export const evaluateSchema: ISchema = {
               },
               smile: {
                 type: 'object', 
-                default: 5, 
                 'x-component': 'SmilingFace', 
                 'x-component-props': {
                   position: 'right', 

src/pages/transaction/purchaserEvaluation/components/EvaluationList/index.tsx

@@ -134,7 +134,7 @@ const EvaluationList = props => {
       {toArr(value).map((item, index) => {
         return (
           <RowStyleLayout {...componentProps} key={index}>
-            <Row align="middle">
+            <Row align="middle" gutter={24}>
               <Col span={8}>
                 <div className="goodInfo">
                   <div className="goodInfo-left">

src/pages/transaction/purchaserEvaluation/unevaluated/evaluate/index.tsx

@@ -14,7 +14,7 @@ import moment from 'moment';
 import { createFormActions, FormEffectHooks } from '@formily/antd';
 import { usePageStatus } from '@/hooks/usePageStatus';
 import { PublicApi } from '@/services/api';
-import { GetOrderPurchaseOrderDetailsResponse } from '@/services/OrderApi';
+import { GetMemberCommentConsumerOrderTradeDetailResponse } from '@/services/MemberV2Api';
 import AvatarWrap from '@/components/AvatarWrap';
 import NiceForm from '@/components/NiceForm';
 import { normalizeUnevaluatedList } from '../../utils';
@@ -40,7 +40,7 @@ interface Unevaluated {
   smile: number; 
 };
 
-interface OrderInfo extends GetOrderPurchaseOrderDetailsResponse {
+interface OrderInfo extends GetMemberCommentConsumerOrderTradeDetailResponse {
   unevaluatedList: Unevaluated[];
 };
 
@@ -56,15 +56,14 @@ const EvaluateOrder: React.FC = () => {
       return;
     }
     setInfoLoading(true);
-    PublicApi.getOrderProcurementOrderDetails({
+    PublicApi.getMemberCommentConsumerOrderTradeDetail({
       id, 
-      orderNo: '',
     } as any).then(res => {
       if (res.code === 1000) {
-        const { orderProductRequests } = res.data; 
+        const { orderProductCommentList } = res.data; 
         setOrderInfo({
           ...res.data, 
-          unevaluatedList: normalizeUnevaluatedList(orderProductRequests), 
+          unevaluatedList: normalizeUnevaluatedList(orderProductCommentList), 
         });
       }
     }).finally(() => {
@@ -171,7 +170,7 @@ const EvaluateOrder: React.FC = () => {
                   <Button
                     type="primary"
                     icon={<FormOutlined />} 
-                    disabled={!orderInfo || !orderInfo.id}
+                    disabled={!orderInfo}
                     loading={submitLoading}
                     onClick={() => formActions.submit()}
                   >
@@ -187,7 +186,7 @@ const EvaluateOrder: React.FC = () => {
                   padding: '0 32px', 
                 }}
               >
-                <Descriptions.Item label="供应会员">{orderInfo?.supplyMembersName}</Descriptions.Item>
+                <Descriptions.Item label="供应会员">{orderInfo?.membersName}</Descriptions.Item>
                 <Descriptions.Item label="下单时间" span={2}>
                   {orderInfo && orderInfo.createTime ? moment(orderInfo.createTime).format('YYYY-MM-DD HH:mm:ss') : ''}
                 </Descriptions.Item>

src/pages/transaction/purchaserEvaluation/unevaluated/index.tsx

@@ -8,7 +8,6 @@ import { createFormActions } from '@formily/antd';
 import moment from 'moment';
 import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch';
 import { FORM_FILTER_PATH } from '@/formSchema/const';
-import { ORDER_TYPE2 } from '@/constants/order';
 import { PublicApi } from '@/services/api';
 import EyePreview from '@/components/EyePreview';
 import NiceForm from '@/components/NiceForm';
@@ -37,13 +36,13 @@ const Unevaluated: React.FC = () => {
     },
     {
       title: '订单摘要',
-      dataIndex: 'orderThe',
+      dataIndex: 'digest',
       align: 'center', 
       ellipsis: true, 
     },
     {
       title: '供应会员',
-      dataIndex: 'supplyMembersName',
+      dataIndex: 'memberName',
       align: 'center',
       render: (text, record) => <>{text}</>,
     },
@@ -51,7 +50,6 @@ const Unevaluated: React.FC = () => {
       title: '下单时间',
       dataIndex: 'createTime',
       align: 'center',
-      render: (text, record) => moment(text).format('YYYY-MM-DD HH:mm:ss'),
     },
     {
       title: '订单总额',
@@ -60,13 +58,12 @@ const Unevaluated: React.FC = () => {
     },
     {
       title: '订单类型',
-      dataIndex: 'type',
+      dataIndex: 'orderTypeName',
       align: 'center', 
-      render: text => ORDER_TYPE2[text],
     },
     {
       title: '外部状态',
-      dataIndex: 'externalState',
+      dataIndex: 'outerStatusName',
       align: 'center',
       render: (text, record) => (
         <StatusTag type="success" title="已完成" />
@@ -74,7 +71,7 @@ const Unevaluated: React.FC = () => {
     },
     {
       title: '内部状态',
-      dataIndex: 'purchaseOrderInteriorState',
+      dataIndex: 'innerStatusName',
       align: 'center',
       render: (text, record) => <Badge color="#41CC9E" text="已完成" />,
     },
@@ -85,11 +82,13 @@ const Unevaluated: React.FC = () => {
       render: (text, record) => (
         <>
           <Link to={`/memberCenter/tranactionAbility/purchaserEvaluation/unevaluated/evaluate?id=${record.id}`}>
-            <Button
-              type="link"
-            >
-              评价
-            </Button>
+            {!record.completeCommentStatus && (
+              <Button
+                type="link"
+              >
+                评价
+              </Button>
+            )}
           </Link>
         </>
       ),
@@ -99,8 +98,16 @@ const Unevaluated: React.FC = () => {
   const [columns, setColumns] = useState<any[]>(defaultColumns);
 
   const fetchListData = (params: any) => {
+    let { createTimeStart, createTimeEnd , ...rest } = params;
+    createTimeStart = createTimeStart ? moment(+createTimeStart).format('YYYY-MM-DD HH:mm:ss') : undefined;
+    createTimeEnd = createTimeEnd ? moment(+createTimeEnd).format('YYYY-MM-DD HH:mm:ss') : undefined;
+
     return new Promise((resolve, reject) => {
-      PublicApi.getOrderProcurementOrderEvaluatedList(params)
+      PublicApi.getMemberOrderCommentBuyerPage({
+        createTimeStart,
+        createTimeEnd,
+        ...rest
+      })
         .then(res => {
           if (res.code === 1000) {
             resolve(res.data);

src/pages/transaction/purchaserEvaluation/unevaluated/schema/index.tsx

@@ -38,14 +38,14 @@ export const listSearchSchema: ISchema = {
             columns: 6,
           },
           properties: {
-            orderThe: {
+            digest: {
               type: 'string',
               'x-component-props': {
                 placeholder: '订单摘要',
                 allowClear: true, 
               },
             },
-            supplyMembersName: {
+            memberName: {
               type: 'string',
               default: undefined,
               'x-component-props': {
@@ -53,7 +53,7 @@ export const listSearchSchema: ISchema = {
                 allowClear: true, 
               },
             },
-            '[startCreateTime, endCreateTime]': {
+            '[createTimeStart, createTimeEnd]': {
               type: 'string',
               default: '',
               'x-component': 'dateSelect', 
@@ -62,7 +62,7 @@ export const listSearchSchema: ISchema = {
                 allowClear: true, 
               },
             },
-            type: {
+            orderType: {
               type: 'string',
               default: undefined,
               enum: [

src/pages/transaction/purchaserEvaluation/utils.ts

@@ -2,7 +2,7 @@
  * @Author: XieZhiXiong
  * @Date: 2020-10-19 16:02:53
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2021-06-02 16:12:34
+ * @LastEditTime: 2021-08-09 16:00:36
  * @Description: 
  */
 
@@ -14,22 +14,25 @@ export const normalizeUnevaluatedList = (arr: {[key: string]: any}[]) => {
     return ret;
   }
   arr.forEach(item => {
-    const atom = {
-      good: {
-        pic: item.imgUrl || '', 
-        productId: item.productId, 
-        productName: item.productName, 
-        unit: item.unit, 
-        price: item.price, 
-        purchaseCount: item.purchaseCount,        // 采购数量
-        totalPrice: +(item.price * item.purchaseCount).toFixed(2), 
-      }, 
-      star: 5,        // 评分星星
-      comment: '',    // 评价
-      picture: [], 
-      smile: 5,       // 笑脸
-    };
-    ret.push(atom);
+    // 未评价过的
+    if (!item.commentStatus) {
+      const atom = {
+        good: {
+          pic: item.logo || '', 
+          productId: item.productId, 
+          productName: item.name, 
+          unit: item.unit, 
+          price: item.price, 
+          purchaseCount: item.quantity,        // 采购数量
+          totalPrice: item.amount, 
+        }, 
+        star: undefined,        // 评分星星
+        comment: '',    // 评价
+        picture: [], 
+        smile: undefined,       // 笑脸
+      };
+      ret.push(atom);
+    }
   });
 
   return ret;

src/pages/transaction/supplierEvaluation/unevaluated/evaluate/index.tsx

@@ -17,7 +17,7 @@ import { PublicApi } from '@/services/api';
 import { GetOrderPurchaseOrderDetailsResponse } from '@/services/OrderApi';
 import AvatarWrap from '@/components/AvatarWrap';
 import NiceForm from '@/components/NiceForm';
-import { normalizeUnevaluatedList } from '../../utils';
+import { normalizeUnevaluatedList } from '../../../purchaserEvaluation/utils';
 import { evaluateSchema } from '../../../purchaserEvaluation/common/schemas/evaluateSchema';
 import { createEffects } from '../../../purchaserEvaluation/common/effects';
 import EvaluationList from '../../../purchaserEvaluation/components/EvaluationList';

src/pages/transaction/supplierEvaluation/unevaluated/index.tsx

@@ -8,7 +8,6 @@ import { createFormActions } from '@formily/antd';
 import moment from 'moment';
 import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch';
 import { FORM_FILTER_PATH } from '@/formSchema/const';
-import { ORDER_TYPE2 } from '@/constants/order';
 import { PublicApi } from '@/services/api';
 import EyePreview from '@/components/EyePreview';
 import NiceForm from '@/components/NiceForm';
@@ -37,7 +36,7 @@ const Unevaluated: React.FC = () => {
     },
     {
       title: '订单摘要',
-      dataIndex: 'orderThe',
+      dataIndex: 'digest',
       align: 'center',
       ellipsis: true,
     },
@@ -51,7 +50,6 @@ const Unevaluated: React.FC = () => {
       title: '下单时间',
       dataIndex: 'createTime',
       align: 'center',
-      render: (text, record) => moment(text).format('YYYY-MM-DD HH:mm:ss'),
     },
     {
       title: '订单总额',
@@ -60,13 +58,12 @@ const Unevaluated: React.FC = () => {
     },
     {
       title: '订单类型',
-      dataIndex: 'type',
-      align: 'center',
-      render: text => ORDER_TYPE2[text],
+      dataIndex: 'orderTypeName',
+      align: 'center', 
     },
     {
       title: '外部状态',
-      dataIndex: 'externalState',
+      dataIndex: 'outerStatusName',
       align: 'center',
       render: (text, record) => (
         <StatusTag type="success" title="已完成" />
@@ -74,7 +71,7 @@ const Unevaluated: React.FC = () => {
     },
     {
       title: '内部状态',
-      dataIndex: 'purchaseOrderInteriorState',
+      dataIndex: 'innerStatusName',
       align: 'center',
       render: (text, record) => <Badge color="#41CC9E" text="已完成" />,
     },
@@ -85,11 +82,13 @@ const Unevaluated: React.FC = () => {
       render: (text, record) => (
         <>
           <Link to={`/memberCenter/tranactionAbility/supplierEvaluation/unevaluated/evaluate?id=${record.id}`}>
-            <Button
-              type="link"
-            >
-              评价
-            </Button>
+            {!record.completeCommentStatus && (
+              <Button
+                type="link"
+              >
+                评价
+              </Button>
+            )}
           </Link>
         </>
       ),
@@ -99,8 +98,16 @@ const Unevaluated: React.FC = () => {
   const [columns, setColumns] = useState<any[]>(defaultColumns);
 
   const fetchListData = (params: any) => {
+    let { createTimeStart, createTimeEnd , ...rest } = params;
+    createTimeStart = createTimeStart ? moment(+createTimeStart).format('YYYY-MM-DD HH:mm:ss') : undefined;
+    createTimeEnd = createTimeEnd ? moment(+createTimeEnd).format('YYYY-MM-DD HH:mm:ss') : undefined;
+
     return new Promise((resolve, reject) => {
-      PublicApi.getOrderEvaluatedList(params)
+      PublicApi.getMemberOrderCommentVendorPage({
+        createTimeStart,
+        createTimeEnd,
+        ...rest
+      })
         .then(res => {
           if (res.code === 1000) {
             resolve(res.data);

src/pages/transaction/supplierEvaluation/utils.ts

-/*
- * @Author: XieZhiXiong
- * @Date: 2020-10-19 16:02:53
- * @LastEditors: XieZhiXiong
- * @LastEditTime: 2020-12-04 10:13:24
- * @Description: 
- */
-
-// 初始化待评价列表
-export const normalizeUnevaluatedList = (arr: {[key: string]: any}[]) => {
-  const ret = [];
-
-  if (!Array.isArray(arr)) {
-    return ret;
-  }
-  arr.forEach(item => {
-    const atom = {
-      good: {
-        pic: item.imgUrl || '', 
-        productId: item.productId, 
-        productName: item.productName, 
-        unit: item.unit, 
-        price: item.price, 
-        purchaseCount: item.purchaseCount,        // 采购数量
-        totalPrice: +(item.price * item.purchaseCount).toFixed(2), 
-      }, 
-      star: 5,        // 评分星星
-      comment: '',    // 评价
-      picture: [], 
-      smile: 5,       // 笑脸
-    };
-    ret.push(atom);
-  });
-
-  return ret;
-};
\ No newline at end of file