Merge branch 'v2' of http://10.0.0.22:3000/lingxi/lingxi-business-system into v2

src/pages/purchaseManage/purchaseAbility/demand/detail/index.tsx

@@ -20,7 +20,7 @@ import { CheckCircleOutlined, LinkOutlined, QuestionCircleOutlined } from '@ant-
 import MaterialLayout from '../../components/detail/components/materialLayout';
 import DemandLayout from '../../components/detail/components/demandLayout';
 import ModalOperate from '../../components/modalOperate';
-import { getPurchasePlatformPurchaseInquiryDetails } from '@/services/PurchaseV2Api';
+import { getPurchasePlatformPurchaseInquiryDetails, getPurchasePlatformPurchaseInquiryProductlistList, postPurchasePlatformPurchaseInquiryExamine } from '@/services/PurchaseV2Api';
 
 const ICON_STYLE: any = {
   color: '#C0C4CC',

src/pages/systemManage/operationLog/components/buttonRadio/index.less

+.buttonRadio{
+  background-color: #fff;
+  &-btn{
+    color: #91959B;
+    font-size: 14px;
+    position: relative;
+    padding: 14px 16px;
+    cursor: pointer;
+  }
+  &-btn-act{
+    color: #252D37;
+  }
+  &-bar{
+    position: absolute;
+    width: 80%;
+    height: 2px;
+    left: 10%;
+    bottom: 0;
+    background-color: #00A98F;
+  }
+}

src/pages/systemManage/operationLog/components/buttonRadio/index.tsx

+import React from 'react';
+import { Row, Col } from 'antd';
+import classNames from 'classnames';
+
+import styles from './index.less';
+
+interface ButtonRadioValue {
+  label: string,
+  value: number
+}
+
+interface ButtonRadioProps {
+  data?: ButtonRadioValue[],
+  actValue?: number,
+  onTab?: (value: number) => void
+}
+
+const ButtonRadio: React.FC<ButtonRadioProps> = (props: ButtonRadioProps) => {
+  const { data, actValue, onTab } = props
+  if (!data || data.length <= 0) {
+    return null
+  }
+
+  const isAct = (value: number) => {
+    return value === actValue;
+  }
+
+  return (
+    <Row className={styles['buttonRadio']}>
+      {data?.map((item, index) => (
+        <Col key={`${item.label}_${index}`}>
+          <div className={classNames(styles['buttonRadio-btn'], {[styles['buttonRadio-btn-act']] : isAct(item.value)})} onClick={() => { onTab?.(item.value) }}>
+            {item.label}
+            {isAct(item.value) ? <div className={styles['buttonRadio-bar']} /> : null}
+          </div>
+        </Col>
+      ))}
+    </Row>
+  );
+}
+
+export default ButtonRadio;

src/pages/systemManage/operationLog/constants.ts

+export const status_3 = {
+  1: {text: '待提交审核',type: 'warnning'},
+  2: {text: '待审核',type: 'warnning'},
+  3: {text: '审核不通过',type: 'danger'},
+  4: {text: '审核通过',type: 'success'},
+};
+
+export const operation_3 = {
+  1: '新增',
+  2: '修改',
+  3: '审核',
+}
+
+export const state_external_5 = {
+  1: {text: '待提交询价单',type: 'default'},
+  2: {text: '待提交报价单',type: 'default'},
+  3: {text: '待确认报价单',type: 'primary'},
+  4: {text: '接受报价',type: 'success'},
+  5: {text: '不接受报价',type: 'danger'},
+}
+
+export const state_interior_5 = {
+  1: {text: '待提交审核',type: 'default'},
+  2: {text: '待审核(一级)',type: 'warnning'},
+  3: {text: '待审核(二级)',type: 'warnning'},
+  4: {text: '待提交询价单',type: 'default'},
+  5: {text: '审核通过',type: 'success'},
+  6: {text: '审核不通过(一)',type: 'danger'},
+  7: {text: '审核不通过(二)',type: 'danger'},
+}
+
+export const state_external_6_1 = {
+'-1': {text: '已作废',type: 'default'},
+  1: {text: '待提交采购需求单',type: 'default'},
+  2: {text: '待审核采购需求单',type: 'warnning'},
+  3: {text: '待提交报价单',type: 'default'},
+  4: {text: '待确认授标结果',type: 'primary'},
+  5: {text: '采购需求单审核不通过',type: 'danger'},
+  6: {text: '发起下轮报价',type: 'default'},
+  99: {text: '已完成',type: 'success'},
+}
+
+export const state_interior_6_1 = {
+  '-1': {text: '已作废',type: 'default'},
+  1: {text: '待提交审核采购需求单',type: 'default'},
+  2: {text: '待审核采购需求单(一级)',type: 'warnning'},
+  3: {text: '待审核采购需求单(二级)',type: 'warnning'},
+  4: {text: '待提交采购需求单',type: 'default'},
+  5: {text: '已提交审核采购需求单',type: 'primary'},
+  8: {text: '审核不通过(一级)',type: 'danger'},
+  9: {text: '审核不通过(二级)',type: 'danger'},
+}

ytt.config.ts

@@ -21,6 +21,7 @@ const tokenList = [
   { name: 'TransactionV2', token: '98fe6ad41a8e1834b017b4795e8cddff5c3def48282ba3d239da5558ca9fc234', categoryIds: [0] }, // 交易服务v2
   { name: 'MarketingV2', token: 'f6d5cee2383ca203dfa2882b84dfa02a1d79de3c3ad892b42f030437fdc5ea21', categoryIds: [0] }, // 营销活动v2
   { name: 'OrderNewV2', token: '3ec2ce1bf7c08ede375d8839ac020cf7657dc2373beaf933b08722208d8eb9e2', categoryIds: [0] }, // 订单服务v2
+  { name: 'ContractV2', token: '4eaaeea2851d8bc52532d65099d08e62ae362a452828b75b036a265e41cc9bc5', categoryIds: [0] }, // 合同服务v2
 ]
 
 const getConfigMap = (tokens) => tokens.map(v => ({