Merge branch 'dev-srm' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev-srm

src/components/UploadFiles/UploadFiles.tsx

@@ -23,6 +23,8 @@ interface PickUploadProps extends Pick<UploadProps, PickProps> {
   fileContainerClassName?: string
   customizeItemRender?: ((files: UploadFile[], handleRemove: (fileItem: UploadFile) => void) => React.ReactNode) | null,
   onRemove?: ((fileItem: UploadFile) => void) | null,
+  /** 是否显示文件 */
+  showFiles?: boolean
 }
 
 const UploadFiles: React.FC<PickUploadProps> = (props: PickUploadProps) => {
@@ -40,7 +42,8 @@ const UploadFiles: React.FC<PickUploadProps> = (props: PickUploadProps) => {
     disable,
     mode,
     buttonText,
-    fileContainerClassName
+    fileContainerClassName,
+    showFiles
   } = props;
   const hasFileListProps = "fileList" in props;
   const auth = getAuth();
@@ -142,10 +145,17 @@ const UploadFiles: React.FC<PickUploadProps> = (props: PickUploadProps) => {
     )
   }
 
+  const renderFileContainer = () => {
+    if (!showFiles) {
+      return null
+    }
+    return !!customizeItemRender ? customizeItemRender(files, handleRemove) : renderFileItem()
+  }
+
   return (
     <div style={containerStyle} >
       {
-        !!customizeItemRender ? customizeItemRender(files, handleRemove) : renderFileItem()
+        renderFileContainer()
       }
       {
         !disable && (
@@ -182,7 +192,8 @@ UploadFiles.defaultProps = {
   disable: false,
   mode: 'default',
   buttonText: '上传文件',
-  fileContainerClassName: ''
+  fileContainerClassName: '',
+  showFiles: true
   // fileList: []
 }
 

src/constants/member.ts

@@ -2,7 +2,7 @@
  * @Author: XieZhiXiong
  * @Date: 2021-05-18 17:36:53
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2021-06-29 16:18:42
+ * @LastEditTime: 2021-07-03 18:41:39
  * @Description: 会员相关常量
  */
 
@@ -53,7 +53,7 @@ export const MEMBER_TYPE = {
 /**
  * 待提交审核
  */
-export const MEMBER_OUTER_TO_PLATFORM_VERIFY = 1;
+export const MEMBER_OUTER_STATUS_TO_PLATFORM_VERIFY = 1;
 /**
  * 待平台审核
  */

src/pages/handling/assign/create/index.tsx

@@ -72,29 +72,50 @@ type submitDataType = {
     commodityId: number,
     /** 附件 */
     enclosure: [],
-    /** 订单商品下 唯一id */
+    /** 订单商品，即下单的商品 唯一id */
     id: string,
     /** 是否是 */
     isHasTax: 0 | 1 | number | {},
     /** 是否含税、税率，显示用 */
-    isHasTaxAndTaxRate: "是/1%",
+    isHasTaxAndTaxRate: string,
     /** 商品图片 */
     mainPic: string,
     /** 商品名 */
     name: string,
-    /** 定点 */
-    orderId: 17532
-    orderNo: "JJDJ21563"
-    processNum: "22"
-    processTotalPrice: "726.00"
-    processUnitPrice: "33"
-    purchaseCount: 3
-    purchaseCountAndUnit: "3/瓶"
-    skuid: 511
-    surplusAndProcessNum: -19
-    taxRate: "1"
-    unitName: "瓶"
-  }
+    /** 订单id, 跟上面id 不一样 */
+    orderId: number,
+    orderNo: string,
+    /** 加工数量 */
+    processNum: string,
+    /** 加工总价 = 加工数量 * 加工单价  */
+    processTotalPrice: string,
+    /** 加工单价 */
+    processUnitPrice: string,
+    /** 采购数量 或者叫订单数量 */
+    purchaseCount: number
+    /** 采购数量 跟 单位，只做显示用 */
+    purchaseCountAndUnit: string,
+    /** skuid, 这里跟commodityId yizhi  */
+    skuid: number
+    /** 加工剩余数量 */
+    surplusAndProcessNum: number,
+    /** 税率 */
+    taxRate: string,
+    /** 单位 */
+    unitName: string
+  },
+  /** 其他说明 */
+  otherDesc: string,
+  /** 包装说明 */
+  packingDesc: string,
+  /** 付款说明 */
+  payDesc: string,
+  /** 税费说明 */
+  taxDesc: string,
+  /** 交付说明 */
+  deliveryDesc: string,
+  /** 物资说明 */
+  materialDesc: string,
 }
 
 /** @tofix 临时的，因为后端不返回只能值么临时搞着 */

src/pages/home/components/UserCenter/index.tsx

-import React, { useReducer } from 'react';
+import React, { useCallback, useMemo, useReducer } from 'react';
 import styles from './index.less';
 import moment from 'moment';
-import { Badge, Upload, message, Spin } from 'antd';
+import { Badge, message, Spin, Tooltip } from 'antd';
 import level1  from '@/assets/imgs/level1.png';
 import level2  from '@/assets/imgs/level2.png';
 import level3  from '@/assets/imgs/level3.png';
@@ -10,12 +10,12 @@ import { Link } from 'umi';
 import { getAuth } from '@/utils/auth';
 import StatusTag from '@/components/StatusTag';
 import home_user from '@/assets/imgs/home_user.png';
-import { UPLOAD_TYPE } from '@/constants'
 import { PublicApi } from '@/services/api';
 import {observer, inject} from 'mobx-react';
-// import Icon from '@ant-design/icons';
-import Icon from '@ant-design/icons';
+import Icon, { QuestionCircleOutlined } from '@ant-design/icons';
 import { ReactComponent as DefaultAvatar } from '@/assets/imgs/default_avatar.svg';
+import UploadFiles from '@/components/UploadFiles/UploadFiles'
+import { UploadChangeParam } from 'antd/lib/upload/interface'
 
 interface Iprops {}
 
@@ -23,7 +23,7 @@ const WEEKDAYS = ["天", "一","二", "三", "四", "五","六"];
 const LEVEL_IMAGE = [level1, level1, level2, level3, level4];
 const EDIT_USER_URL = '/memberCenter/editMySelf';
 const USER_CENTER_URL = '/memberCenter/memberAbility/manage/maintain'
-const STATUS_COLOR: ("default" | "processing" | "error" | "success")[] = ["default", "processing", "error", "success"]
+const STATUS_COLOR: ("default" | "processing" | "error" | "success")[] = ["default", "processing", "error", "success", "error"]
 
 function reducer(state, action) {
   switch (action.type) {
@@ -39,49 +39,36 @@ function reducer(state, action) {
 const UserCenter: React.FC<Iprops> = (props) => {
   const today = moment();
   const userAuth = getAuth();
-  // const hasChangeMemberAuth = userAuth?.urls.includes(EDIT_USER_URL);
-  // const hasCenterAuth = userAuth?.urls.includes(USER_CENTER_URL);
   const currentRole = userAuth?.roles?.filter((item) => item.memberRoleId === userAuth.memberRoleId)
   const [state, dispatch] = useReducer(reducer, { loading: false, logo: userAuth?.logo})
   if(!userAuth) {
     return null
   }
+  const beforeUpload = useCallback((file) => {
+    const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png' || file.type === 'image/jpg';
+    if (!isJpgOrPng) {
+      message.error('仅支持上传JPEG/JPG/PNG文件!');
+    }
+    return isJpgOrPng;
+  }, [])
 
-  const uploadProps = {
-    name: 'file',
-    action: '/api/file/file/upload',
-    headers: {},
-    data: {
-      fileType: UPLOAD_TYPE
-    },
-    disabled: state.loading,
-    showUploadList: false,
-    onChange(info) {
-      if (info.file.status === 'uploading') {
-        dispatch({type: 'uploading'})
-        return;
-      }
-      if (info.file.status === 'done') {
-        const { code, data } = info.file.response
-        if(code === 1000) {
-          PublicApi.postMemberMainpageLogoAdd({logo: data})
-          .then((res) => {
-            if(res.code === 1000) {
-              dispatch({type: 'done',  payload: {url: data}})
-              props.UserStore.setUserAvatar(data)
-            }
-          })
-        }
-      }
-    },
-    beforeUpload(file){
-      const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png' || file.type === 'image/jpg';
-      if (!isJpgOrPng) {
-        message.error('仅支持上传JPEG/JPG/PNG文件!');
+  const onFileChange = async (info: UploadChangeParam) => {
+    if (info.file.status === 'uploading') {
+      dispatch({type: 'uploading'})
+      return;
+    }
+    if(info.file.status === 'done') {
+      const logo =  info.file.response.data
+      const { code } = await PublicApi.postMemberMainpageLogoAdd({logo: logo });
+      if (code === 1000) {
+        dispatch({type: 'done',  payload: {url: logo}})
+        props.UserStore.setUserAvatar(logo)
       }
-      return isJpgOrPng;
     }
   }
+
+  const isVerifyFail = useMemo(() => [2, 4].includes(userAuth.validateStatus), [userAuth]);
+
   return (
     <div className={styles.container}>
       <div className={styles.header}>
@@ -98,18 +85,18 @@ const UserCenter: React.FC<Iprops> = (props) => {
         </div>
       </div>
       <div className={styles.content}>
-        {/* http://10.0.0.25:4000/project/15/interface/api/38926 上传用户头像 */}
         <Spin spinning={state.loading}>
           <div className={styles.userLogo}>
             <div className={styles.randomLogo}>
-              <Upload {...uploadProps}>
+
+              <UploadFiles customizeItemRender={null} beforeUpload={beforeUpload} onChange={onFileChange} showFiles={false}>
                 {
                   state.logo
                   ? <img src={state.logo || ''} className={styles.logo}/>
                   : <Icon component={() => <DefaultAvatar className={styles.logo} />} />
                 }
                 <span className={styles.upload}>修改</span>
-              </Upload>
+              </UploadFiles>
             </div>
           </div>
         </Spin>
@@ -130,12 +117,21 @@ const UserCenter: React.FC<Iprops> = (props) => {
                   }
                 </div>
                 <div style={{marginTop: '13px'}}>
-                  <Badge status={STATUS_COLOR[userAuth.validateStatus]} text={userAuth.validateStatusDesc} />
+                  <Tooltip placement="top" title={userAuth.validateMsg || ''}>
+                    <Badge status={STATUS_COLOR[userAuth.validateStatus]} text={userAuth.validateStatusDesc} />
+                    {
+                      isVerifyFail && (
+                        <span style={{marginLeft: '4px'}}>
+                          <QuestionCircleOutlined style={{color: '#ccc', fontSize: '12px'}} />
+                        </span>
+                      )
+                    }
+                  </Tooltip>
                 </div>
               </div>
             </div>
             {
-              userAuth.validateStatus === 2 &&
+              isVerifyFail &&
               <Link to={EDIT_USER_URL} className={styles.link}>修改会员信息</Link>
             }
           </div>
@@ -147,7 +143,11 @@ const UserCenter: React.FC<Iprops> = (props) => {
               <div className={styles.score}>
                 平台积分： <strong>{userAuth.score}</strong>
               </div>
-              <Link to={USER_CENTER_URL} className={styles.link}>进入会员中心</Link>
+              {
+                userAuth.urls.includes(USER_CENTER_URL) && (
+                  <Link to={USER_CENTER_URL} className={styles.link}>进入会员中心</Link>
+                )
+              }
             </div>
           </div>
         </div>

src/pages/member/components/MemberChangedInfo/index.tsx

@@ -2,7 +2,7 @@
  * @Author: XieZhiXiong
  * @Date: 2021-05-21 18:14:10
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2021-05-21 18:18:11
+ * @LastEditTime: 2021-07-03 17:24:28
  * @Description: 会员变更信息
  */
 import React, { useState, useEffect } from 'react';
@@ -90,7 +90,7 @@ const MemberChangedInfo: React.FC<IProps> = (props: IProps) => {
   const columns: EditableColumns[] = [
     {
       title: '序号',
-      dataIndex: 'index',
+      dataIndex: 'id',
     },
     {
       title: '变更日期',

src/pages/member/components/MemberDocIncomingInfo/index.tsx

@@ -2,7 +2,7 @@
  * @Author: XieZhiXiong
  * @Date: 2021-05-21 17:14:39
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2021-07-03 14:57:41
+ * @LastEditTime: 2021-07-03 17:33:17
  * @Description: 会员入库信息
  */
 import React from 'react';
@@ -47,11 +47,16 @@ interface IProps extends Omit<CustomizeColumnProps, 'data' | 'columns'>  {
       fieldType?: string,
     }[],
   }[],
+  /**
+   * 是否展示 new
+   */
+  showNew?: boolean,
 }
 
 const MemberDocIncomingInfo: React.FC<IProps> = (props: IProps) => {
   const {
     dataSource = [],
+    showNew = false,
     ...rest
   } = props;
 
@@ -65,13 +70,16 @@ const MemberDocIncomingInfo: React.FC<IProps> = (props: IProps) => {
           <div className={styles.changed}>
             {/* {ele.fieldValue} */}
             {renderFieldTypeContent(ele.fieldType, ele.fieldValue)}
-            {ele.lastValue && (
+            {showNew && ele.lastValue && ele.lastValue !== ele.fieldValue && (
               <Tooltip title={`变更前：${ele.lastValue}`}>
                 <span className={styles.new}>NEW</span>
               </Tooltip>
             )}
           </div>
         ),
+        columnProps: {
+          span: 1,
+        },
       });
     });
   });

src/pages/member/constant.tsx

@@ -27,6 +27,7 @@ import {
   MEMBER_INNER_STATUS_MODIFY_PASSED,
   MEMBER_INNER_STATUS_MODIFY_NOT_PASSED,
 
+  PLATFORM_MEMBER_INNER_STATUS_TO_BE_COMMIT,
   PLATFORM_MEMBER_INNER_STATUS_COMMIT_NOT_PASSED,
   PLATFORM_MEMBER_INNER_STATUS_TO_BE_VERIFY_STEP1,
   PLATFORM_MEMBER_INNER_STATUS_VERIFY_STEP1_NOT_PASSED,
@@ -36,7 +37,7 @@ import {
   PLATFORM_MEMBER_INNER_STATUS_VERIFY_NOT_PASSED,
   PLATFORM_MEMBER_INNER_STATUS_VERIFY_PASSED,
 
-  MEMBER_OUTER_TO_PLATFORM_VERIFY,
+  MEMBER_OUTER_STATUS_TO_PLATFORM_VERIFY,
   MEMBER_OUTER_STATUS_PLATFORM_VERIFYING,
   MEMBER_OUTER_STATUS_PLATFORM_VERIFY_PASSED,
   MEMBER_OUTER_STATUS_PLATFORM_VERIFY_NOT_PASSED,
@@ -70,7 +71,7 @@ export const MEMBER_STATUS_TAG_MAP = {
 
 // 会员外部状态 StatusTag map
 export const MEMBER_OUTER_STATUS_TYPE = {
-  [MEMBER_OUTER_TO_PLATFORM_VERIFY]: 'default',
+  [MEMBER_OUTER_STATUS_TO_PLATFORM_VERIFY]: 'default',
   [MEMBER_OUTER_STATUS_PLATFORM_VERIFYING]: 'warning',
   [MEMBER_OUTER_STATUS_PLATFORM_VERIFY_PASSED]: 'success',
   [MEMBER_OUTER_STATUS_PLATFORM_VERIFY_NOT_PASSED]: 'danger',
@@ -107,6 +108,7 @@ export const MEMBER_INNER_STATUS_BADGE_COLOR = {
   [MEMBER_INNER_STATUS_MODIFY_PASSED]: 'green',
   [MEMBER_INNER_STATUS_MODIFY_NOT_PASSED]: 'red',
 
+  [PLATFORM_MEMBER_INNER_STATUS_TO_BE_COMMIT]: 'grey',
   [PLATFORM_MEMBER_INNER_STATUS_COMMIT_NOT_PASSED]: 'red',
   [PLATFORM_MEMBER_INNER_STATUS_TO_BE_VERIFY_STEP1]: 'orange',
   [PLATFORM_MEMBER_INNER_STATUS_VERIFY_STEP1_NOT_PASSED]: 'red',

src/pages/member/memberEvaluate/schema/add.tsx

@@ -70,7 +70,7 @@ export const evaluateAddSchema: ISchema = {
                   display: false,
                 },
                 '[appraisalDayStart, appraisalDayEnd]': {
-                  title: "整改时间",
+                  title: <div>考评时间 <span style={{color: '#ff4d4f', fontSize: '16px', marginLeft: '4px', fontWeight: 600}}>*</span></div>,
                   type: 'object',
                   "x-component": 'FormilyRangeTime',
                    "x-rules": [

src/pages/member/memberImport/components/MemberForm/index.tsx

@@ -191,6 +191,7 @@ const MemberForm: React.FC<MemberFormProps> = ({
       memberTypeId,
       roleId,
       level,
+      levelId,
       countryCodeId,
       phone,
       email,

src/pages/member/memberPrVerifyChange1/detail.tsx

@@ -174,6 +174,7 @@ const MemberPrVerifyChange1Detail: React.FC<{}> = () => {
               <MemberDocIncomingInfo
                 dataSource={memberInfo?.depositDetails}
                 id="incomingInfo"
+                showNew
               />
             </Col>
           ) : null}

src/pages/member/memberPrVerifyChange1/verify.tsx

@@ -216,6 +216,7 @@ const MemberPrVerifyChange1Verify: React.FC<{}> = () => {
               <MemberDocIncomingInfo
                 dataSource={memberInfo?.depositDetails}
                 id="incomingInfo"
+                showNew
               />
             </Col>
           ) : null}

src/pages/member/memberPrVerifyChange2/detail.tsx

@@ -174,6 +174,7 @@ const MemberPrVerifyChange2Detail: React.FC<{}> = () => {
               <MemberDocIncomingInfo
                 dataSource={memberInfo?.depositDetails}
                 id="incomingInfo"
+                showNew
               />
             </Col>
           ) : null}

src/pages/member/memberPrVerifyChange2/verify.tsx

@@ -216,6 +216,7 @@ const MemberPrVerifyChange2Verify: React.FC<{}> = () => {
               <MemberDocIncomingInfo
                 dataSource={memberInfo?.depositDetails}
                 id="incomingInfo"
+                showNew
               />
             </Col>
           ) : null}

src/pages/member/memberPrVerifyChangeConfirm/detail.tsx

@@ -174,6 +174,7 @@ const MemberPrVerifyChangeConfirmDetail: React.FC<{}> = () => {
               <MemberDocIncomingInfo
                 dataSource={memberInfo?.depositDetails}
                 id="incomingInfo"
+                showNew
               />
             </Col>
           ) : null}

src/pages/member/memberPrVerifyChangeConfirm/verify.tsx

@@ -2,7 +2,7 @@
  * @Author: XieZhiXiong
  * @Date: 2021-05-26 10:26:37
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2021-06-15 16:24:29
+ * @LastEditTime: 2021-07-03 18:05:00
  * @Description: 确认会员变更
  */
 import React, { useState, useEffect } from 'react';
@@ -216,6 +216,7 @@ const MemberPrVerifyChangeConfirmVerify: React.FC<{}> = () => {
               <MemberDocIncomingInfo
                 dataSource={memberInfo?.depositDetails}
                 id="incomingInfo"
+                showNew
               />
             </Col>
           ) : null}

src/pages/member/memberQuery/schema/createRole.ts

@@ -2,7 +2,7 @@
  * @Author: XieZhiXiong
  * @Date: 2021-06-04 15:51:19
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2021-06-04 15:51:20
+ * @LastEditTime: 2021-07-03 17:19:58
  * @Description: 
  */
 import { ISchema } from '@formily/antd';
@@ -41,7 +41,7 @@ export const schema = (groups: GroupItem[]): ISchema => {
               wrapperCol: 8,
               labelAlign: 'left',
             },
-            properties: createMemberSchema(item.elements),
+            properties: createMemberSchema(item.elements, false),
           },
         },
       };

src/pages/member/utils.tsx

@@ -104,12 +104,15 @@ const RULE_REG_MAP = {
   4: PATTERN_MAPS.tel,
 };
 
-const getFieldType = (field: ElementType) => {
+const getFieldType = (field: ElementType, editable: boolean = true) => {
+
+  const isDisabled = (!editable && field.fieldValue) || !!field.disabled;
+
   // 默认是 输入框
   let description: { [key: string]: any } = {
     'x-component-props': {
       placeholder: field.fieldRemark, 
-      disabled: !!field.disabled,
+      disabled: isDisabled,
     },
   };
   // 公共的属性
@@ -144,7 +147,7 @@ const getFieldType = (field: ElementType) => {
         'x-component': 'CustomUpload',
         'x-component-props': {
           showDesc: false,
-          disabled: !!field.disabled,
+          disabled: isDisabled,
         },
       };
       break;
@@ -154,7 +157,7 @@ const getFieldType = (field: ElementType) => {
         'x-component': 'RadioGroup',
         enum: field.fieldEnum,
         'x-component-props': {
-          disabled: !!field.disabled,
+          disabled: isDisabled
         },
       };
       break;
@@ -163,7 +166,7 @@ const getFieldType = (field: ElementType) => {
       description = {
         enum: field.fieldEnum,
         'x-component-props': {
-          disabled: !!field.disabled,
+          disabled: isDisabled,
         },
       };
       break;
@@ -173,7 +176,7 @@ const getFieldType = (field: ElementType) => {
         'x-component': 'CheckboxGroup',
         enum: field.fieldEnum,
         'x-component-props': {
-          disabled: !!field.disabled,
+          disabled: isDisabled,
         },
       };
       break;
@@ -182,7 +185,7 @@ const getFieldType = (field: ElementType) => {
       description = {
         'x-component': 'AreaSelect',
         'x-component-props': {
-          disabled: !!field.disabled,
+          disabled: isDisabled,
         },
       };
       break;
@@ -193,15 +196,20 @@ const getFieldType = (field: ElementType) => {
   return Object.assign({}, description, common);
 };
 
-// 根据后台生成注册资料 schema
-export function createMemberSchema(elements: ElementType[]) {
+/**
+ * 根据后台生成注册资料 schema
+ * @param elements 
+ * @param editable 有值的元素是否可编辑
+ * @returns 
+ */
+export function createMemberSchema(elements: ElementType[], editable: boolean = true) {
   const components = {};
   
   if (!Array.isArray(elements)) {
     return components;
   }
   for (let item of elements) {
-    components[item.fieldName as string] = getFieldType(item);
+    components[item.fieldName as string] = getFieldType(item, editable);
   }
   return components;
 };

src/pages/procurement/callForBids/addRemarkBidCommittee/schema/modal.ts

@@ -62,6 +62,7 @@ export const selectBidSchema: ISchema = {
         inline: false,
         rowStyle: {
           justifyContent: 'start',
+          rowGap: 20
         },
         colStyle: {
           marginRight: 20

src/pages/procurement/components/descriptionsInfo/index.tsx

@@ -95,8 +95,8 @@ const DescriptionsInfo: React.FC<BasicInfoProps> = ({cardTitle, type}) => {
       span: 8,
       fieldList: [
         { title: '投标编号:', name: 'code', render: () => _data['code'] },
-        { title: '外部状态:', name: 'submitTenderOutStatus', render: (text) => TenderOutStateTexts[_data['submitTenderOutStatus']]},
-        { title: '内部状态:', name: 'submitTenderInStatus', render: (text) => TenderInStateTexts[_data['submitTenderInStatus']] },
+        { title: '外部状态:', name: 'submitTenderOutStatusValue', render: () => _data['submitTenderOutStatusValue']},
+        { title: '内部状态:', name: 'submitTenderInStatusValue', render: () => _data['submitTenderInStatusValue']},
         { title: '投标项目:', name: 'projectName' },
       ]
     },

src/pages/procurement/constants/index.tsx

@@ -26,7 +26,7 @@ export const processLogResponses = (resData) => {
     id: item.taskStep,
     name: item.taskName,
     operationRole: item.memberRoleName,
-    isActive: item.taskStep < currentOuterStep
+    isActive: currentOuterStep === 0 ? true : (item.taskStep < currentOuterStep)
   }))
   const subTasks = externalTasks.filter(item => item.taskStep === currentOuterStep)
   const interiorLogs = subTasks.length ? subTasks[0]['subTasks'].map(item => ({

src/pages/procurement/tender/addTender/model/useProductTable.tsx

@@ -131,7 +131,7 @@ export const useProductTable = (ctx: ISchemaFormActions | ISchemaFormAsyncAction
           </Col>
           <Col span={6}>
             <div className={style.childrenContent}>
-              <p><span>品牌:</span>{data.brand.name}</p>
+              <p><span>品牌:</span>{data?.brand?.name}</p>
             </div>
           </Col>
           {/* <Col span={3}>

src/pages/procurement/tender/firstCheckedTender/schema/index.ts

@@ -8,7 +8,7 @@ export const tableListSchema: ISchema = {
       type: 'string',
       "x-component": 'SearchFilter',
       'x-component-props': {
-        placeholder: '请输入招标编号',
+        placeholder: '请输入投标编号',
         align: 'flex-end',
       },
     },

src/pages/procurement/tender/readyAddTender/index.tsx

@@ -31,18 +31,18 @@ const ReadyAddTender:React.FC<ReadyAddTenderProps> = (props) => {
   const { columns, ref, rowSelection, rowSelectionCtl } = useSelfTable()
 
   const handleBitchPush = async () => {
-    const canBitch = !rowSelectionCtl.selectRow.some(v => v.submitTenderInStatus !== TenderInsideWorkState.Not_Submitted_Check_Submit_Tender)
+    // const canBitch = !rowSelectionCtl.selectRow.some(v => v.submitTenderInStatus !== TenderInsideWorkState.Not_Submitted_Check_Submit_Tender)
     if(!rowSelectionCtl.selectRow.length) return message.error('请先选择投标')
-    if (canBitch) {
+    // if (canBitch) {
       const { code } = await run({idList: rowSelectionCtl.selectedRowKeys})
       if (code === 1000) {
         ref.current.reload()
         rowSelectionCtl.setSelectRow([])
         rowSelectionCtl.setSelectedRowKeys([])
       }
-    } else {
-      message.error('只能提交待提交审核投标的投标')
-    }
+    // } else {
+    //   message.error('只能提交待提交审核投标的投标')
+    // }
   }
 
   return <PageHeaderWrapper>

src/pages/procurement/tender/secondCheckedTender/index.tsx

@@ -67,7 +67,7 @@ const SecondCheckedTender:React.FC<SecondCheckedTenderProps> = (props) => {
               useStateFilterSearchLinkageEffect(
                 $,
                 actions,
-                'orderNo',
+                'submitTenderCode',
                 FORM_FILTER_PATH,
               );
             },

src/pages/procurement/tender/secondCheckedTender/schema/index.ts

 import { ISchema } from '@formily/antd';
 import { FORM_FILTER_PATH } from '@/formSchema/const';
-// import { OrderTypeMap } from '@/constants/order';
 
 export const tableListSchema: ISchema = {
   type: 'object',
   properties: {
-    orderNo: {
+    submitTenderCode: {
       type: 'string',
       "x-component": 'SearchFilter',
       'x-component-props': {
-        placeholder: '请输入订单编号',
+        placeholder: '请输入投标编号',
         align: 'flex-end',
       },
     },
@@ -19,39 +18,35 @@ export const tableListSchema: ISchema = {
       'x-component-props': {
         inline: true,
         colStyle: {
-          marginLeft: 20
-        }
+          marginRight: 20
+        },
       },
       properties: {
-        orderThe: {
+        inviteTenderCode: {
           type: 'string',
           'x-component-props': {
-            placeholder: '请输入订单摘要',
-          }
+            placeholder: '请输入招标编号',
+          },
         },
-        "supplyMembersName": {
+        projectName: {
           type: 'string',
-          "x-component-props": {
-            placeholder: '请输入供应会员名称'
+          'x-component-props': {
+            placeholder: '请输入招标项目',
           }
         },
-        "type": {
-          type: 'string',
-          "x-component-props": {
-            placeholder: '请选择订单类型'
-          },
-          // enum: Object.keys(OrderTypeMap).map(item => ({
-          //   label: OrderTypeMap[item],
-          //   value: item,
-          // }))
-        },
-        "[startCreateTime,endCreateTime]": {
+        "[startTime,endTime]": {
           type: 'array',
           "x-component": 'DateRangePickerUnix',
           'x-component-props': {
-            placeholder: ['开始时间','结束时间'],
+            placeholder: ['发布开始时间','发布结束时间'],
           },
         },
+        inviteTenderMemberName: {
+          type: 'string',
+          'x-component-props': {
+            placeholder: '请输入招标会员',
+          }
+        },
         submit: {
           'x-component': 'Submit',
           'x-component-props': {

src/pages/transaction/purchaserEvaluation/received/detail/schema/index.ts

@@ -54,6 +54,7 @@ export const evaluateSchema: ISchema = {
                   comment: {
                     type: 'string', 
                     title: '评价', 
+                    required: true,
                     'x-component': 'TextArea', 
                     'x-component-props': {
                       rows: 4, 

src/pages/transaction/purchaserEvaluation/sent/components/DetailInfo/schema/index.ts

@@ -54,6 +54,7 @@ export const evaluateSchema: ISchema = {
                   comment: {
                     type: 'string', 
                     title: '评价', 
+                    required: true,
                     'x-component': 'TextArea', 
                     'x-component-props': {
                       rows: 4, 

src/pages/transaction/purchaserEvaluation/unevaluated/evaluate/schema/index.ts

@@ -54,7 +54,8 @@ export const evaluateSchema: ISchema = {
                   }, 
                   comment: {
                     type: 'string', 
-                    title: '评价', 
+                    title: '评价',
+                    required: true,
                     'x-component': 'TextArea', 
                     'x-component-props': {
                       rows: 4, 

src/pages/transaction/supplierEvaluation/received/detail/schema/index.ts

@@ -54,6 +54,7 @@ export const evaluateSchema: ISchema = {
                   comment: {
                     type: 'string', 
                     title: '评价', 
+                    required: true,
                     'x-component': 'TextArea', 
                     'x-component-props': {
                       rows: 4, 

src/pages/transaction/supplierEvaluation/sent/components/DetailInfo/schema/index.ts

@@ -54,6 +54,7 @@ export const evaluateSchema: ISchema = {
                   comment: {
                     type: 'string', 
                     title: '评价', 
+                    required: true,
                     'x-component': 'TextArea', 
                     'x-component-props': {
                       rows: 4, 

src/pages/transaction/supplierEvaluation/unevaluated/evaluate/schema/index.ts

@@ -2,7 +2,7 @@
  * @Author: XieZhiXiong
  * @Date: 2020-09-23 17:00:24
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2021-01-13 10:16:27
+ * @LastEditTime: 2021-07-03 18:49:30
  * @Description:
  */
 import { ISchema } from '@formily/antd';
@@ -55,6 +55,7 @@ export const evaluateSchema: ISchema = {
                   comment: {
                     type: 'string',
                     title: '评价',
+                    required: true,
                     'x-component': 'TextArea',
                     'x-component-props': {
                       rows: 4,