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

src/components/NiceForm/components/DateSelect.tsx

@@ -18,9 +18,7 @@ const getPrevTime = (num, flag) => {
 const DateSelect = (props) => {
   const { value, mutators } = props
   const todayStartTime = moment().startOf('day').format('x')
-  // const nowTime = moment().format('x').valueOf()
-  /** 当天的23:59:59 */
-  const nowTime = moment().endOf('day').valueOf()
+  const nowTime = moment().format('x').valueOf()
   const dateMemo = useMemo(() => [
     { label: '今天',  value: `${todayStartTime},${nowTime}`},
     { label: '一周内',  value: `${getPrevTime(1, 'week')},${nowTime}`},

src/pages/transaction/purchaseAbility/components/detail/components/contrastLyout1/index.tsx

@@ -280,7 +280,7 @@ const ContrastLyout1: React.FC<IProps> = (props: any) => {
               data-index={index}
               tab={`第${chNum[item]}轮`}
             >
-              {(rowSource[idx] && rowSource[idx].length > 0 ) ? <RowLayout rowSource={rowSource[idx]} /> :
+              {(rowSource[idx] && rowSource[idx].length > 0 ) ? <RowLayout encrypt={encrypt} rowSource={rowSource[idx]} /> :
                 <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />
               }
               <Skeleton

src/pages/transaction/purchaseAbility/components/detail/components/contrastLyout1/rowLayout/index.tsx

@@ -7,10 +7,12 @@ import { PRICECONTRAST_TYPE } from '../../../../../constants';
 export interface IProps {
   /** 信息数据 */
   rowSource?: any,
+  /** 是否加密 */
+  encrypt?: number,
 }
 
 const RowLayout: React.FC<IProps> = (props: any) => {
-  const { rowSource } = props;
+  const { rowSource, encrypt } = props;
   const format = (text, fmt?: string) => {
     return <>{moment(text).format(fmt || "YYYY-MM-DD HH:mm:ss")}</>
   }
@@ -62,7 +64,7 @@ const RowLayout: React.FC<IProps> = (props: any) => {
                 </Row>
               </div>
               <div className={style['card-badge']}>
-                {item.isDecrypt === PRICECONTRAST_TYPE.UNENCRYPTED ? '已解密' : '未解密'}
+                {item.isDecrypt === PRICECONTRAST_TYPE.UNENCRYPTED ? (encrypt === 1 ? '未加密' : '已解密') : '未解密'}
               </div>
               {item.isDecrypt === PRICECONTRAST_TYPE.UNENCRYPTED && <Typography.Link href={`/memberCenter/procurementAbility/confirmOffer/quote/detail?id=${item.id}&number=${item.quotedPriceNo}&turn=${item.turn}`} className={style['card-link']}>查看报价详情</Typography.Link>}
               {item.isDecrypt === PRICECONTRAST_TYPE.UNDECRYPTED && <Tooltip placement="topLeft" title='当前报价为密封报价，请先解密报价单'><Typography.Text className={style['card-link']} type='success'>查看报价详情</Typography.Text></Tooltip>}

src/pages/transaction/purchaseAbility/schema/demandPlan.ts

@@ -54,9 +54,9 @@ export const DEMANDPLANSERCH_SECHEMA: ISchema = {
             },
             "[startTime,endTime]": {
               type: 'string',
-              "x-component": "dateSelect",
+              "x-component": "DateRangePickerUnix",
               "x-component-props": {
-                placeholder: '需求计划周期',
+                placeholder: ['开始时间','结束时间'],
               }
             },
             innerStatusList: {
@@ -144,9 +144,9 @@ export const DEMANDPLANADDED_SECHEMA: ISchema = {
             },
             "[startTime,endTime]": {
               type: 'string',
-              "x-component": "dateSelect",
+              "x-component": "DateRangePickerUnix",
               "x-component-props": {
-                placeholder: '需求计划周期',
+                placeholder: ['开始时间','结束时间'],
               }
             },
           }
@@ -216,9 +216,9 @@ export const DEMANDPLAN_SECHEMA: ISchema = {
             },
             "[startTime,endTime]": {
               type: 'string',
-              "x-component": "dateSelect",
+              "x-component": "DateRangePickerUnix",
               "x-component-props": {
-                placeholder: '需求计划周期',
+                placeholder: ['开始时间','结束时间'],
               }
             },
           }

src/pages/transaction/purchaseAbility/schema/purchasePlan.ts

@@ -53,9 +53,9 @@ export const PURCHASEPLANSERCH_SECHEMA: ISchema = {
             },
             "[startTime,endTime]": {
               type: 'string',
-              "x-component": "dateSelect",
+              "x-component": "DateRangePickerUnix",
               "x-component-props": {
-                placeholder: '需求计划周期',
+                placeholder: ['开始时间','结束时间'],
               }
             },
             innerStatusList: {
@@ -136,9 +136,9 @@ export const PURCHASEPLAN_SECHEMA: ISchema = {
             },
             "[startTime,endTime]": {
               type: 'string',
-              "x-component": "dateSelect",
+              "x-component": "DateRangePickerUnix",
               "x-component-props": {
-                placeholder: '采购计划周期',
+                placeholder: ['开始时间','结束时间'],
               }
             },
           }