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

config/proxy.ts

 export default {
-  '/api/member': {
-    'target': 'http://10.0.0.12:8100',
-    'changeOrigin': true,
-    'pathRewrite': { '^/api/member': '/member' },
-  },
+  // '/api/member': {
+  //   'target': 'http://10.0.0.12:8100',
+  //   'changeOrigin': true,
+  //   'pathRewrite': { '^/api/member': '/member' },
+  // },
   '/api': {
     'target': process.env.BACK_GATEWAY || 'http://10.0.0.10:8100/',
     'changeOrigin': true,

config/routes/index.ts

@@ -58,13 +58,13 @@ const memberCenterRoute = {
       noMargin: true,
       name: '修改个人信息'
     },
-    {
-      path: `/memberCenter/home`,
-      name: 'home',
-      icon: 'home',
-      key: 'home',
-      component: '@/pages/home',
-    },
+    // {
+    //   path: `/memberCenter/home`,
+    //   name: 'home',
+    //   icon: 'home',
+    //   key: 'home',
+    //   component: '@/pages/home',
+    // },
     // ShopRoute,
     // CommodityRoute,
     // srm开发临时使用...
@@ -75,9 +75,9 @@ const memberCenterRoute = {
     // contracRoute,
     //...
     // AuthConfigRoute,
-    MemberRoute,
-    HandlingRoute,
-    // ...asyncRoutes,
+    // MemberRoute,
+    // HandlingRoute,
+    ...asyncRoutes,
     {
       path: '/memberCenter/noAuth',
       auth: false,

src/pages/transaction/purchaseAbility/components/modalOperate/index.tsx

@@ -9,6 +9,7 @@ import { Input, Radio, DatePicker, Checkbox } from '@formily/antd-components'
 import moment from 'moment';
 
 import styles from './index.less';
+import { isEmpty } from 'lodash';
 
 const actions = createFormActions()
 const { onFieldChange$ } = FormEffectHooks;
@@ -148,7 +149,7 @@ const ModalOperate: React.FC<IProps> = (props: any) => {
             }}
           />
           <Field
-            name="checkbox"
+            name="isNow"
             x-component="CheckboxGroup"
             description="勾选后供应商不能再提交报价单"
             enum={[{ label: '立即截止报价', value: 1 }]}
@@ -218,6 +219,7 @@ const ModalOperate: React.FC<IProps> = (props: any) => {
       params.discardTime = new Date(value.reasonTime).getTime();
     } else if (modalType === 'date') {
       params.quotedPriceTime = new Date(value.quotedPriceTime).getTime();
+      params.isNow = !isEmpty(value.isNow) ? 1 : 0;
     } else if (modalType === 'next') {
       params.quotedPriceTime = new Date(value.quotedPriceTime).getTime();
     } else if (modalType === 'planAudit') {

src/pages/transaction/purchaseAbility/confirmOffer/offerInquire/index.tsx

@@ -130,6 +130,8 @@ const OfferInquire = () => {
         columns={columns}
         effects="purchaseInquiryNo"
         fetch={PublicApi.getPurchaseConfirmQuotedPriceList}
+        externalStatusFetch={PublicApi.getPurchasePurchaseInquiryExternalStatusPurchase}
+        interiorStatusFetch={PublicApi.getPurchasePurchaseInquiryInteriorStatusPurchase}
         reload={ref}
       />
       <ModalOperate

src/pages/transaction/purchaseAbility/constants/columns.tsx

@@ -31,7 +31,7 @@ export const EXTERNALLOGS: ColumnType<any>[] = [
     title: '状态',
     key: 'state',
     dataIndex: 'state',
-    render: (_text: any, _record: any) => <Tag color={OFFTER_EXTERNALSTATE_COLOR[_text]}>{OFFTER_EXTERNALSTATE[_text]}</Tag>
+    render: (_text: any, _record: any) => <Tag color={OFFTER_EXTERNALSTATE_COLOR[_text] || 'default'}>{_record.stateName}</Tag>
   },
   {
     title: '操作',
@@ -77,7 +77,7 @@ export const INTERNALLOGS: ColumnType<any>[] = [
     title: '状态',
     key: 'state',
     dataIndex: 'state',
-    render: (_text: any, _record: any) => <Tag color={OFFTER_INTERNALSTATE_COLOR[_text]}>{OFFTER_INTERNALSTATE[_text]}</Tag>
+    render: (_text: any, _record: any) => <Tag color={OFFTER_INTERNALSTATE_COLOR[_text] || 'default'}>{_record.stateName}</Tag>
   },
   {
     title: '操作',

src/pages/transaction/purchaseAbility/constants/index.ts

@@ -338,7 +338,7 @@ export const DEMANDPLANINTERNALSTATE = [
 
 export enum BUTTONAUTHORITY {
   /** 提交审核修改删除查看 */
-  OEN = 1,
+  ONE = 1,
   /** 修改查看 */
   TWO,
   /** 报价查看 */

src/pages/transaction/purchaseAbility/purchaseInquiry/addInquiry/index.tsx

@@ -5,13 +5,14 @@ import { ColumnType } from 'antd/lib/table/interface';
 import EyePreview from '@/components/EyePreview';
 import moment from 'moment'
 import { PublicApi } from '@/services/api';
-import { Row, Col, Space, Button, Dropdown, Menu, Tag, Badge, Popconfirm, Typography } from 'antd';
-import { DeleteOutlined, DownOutlined, PlusOutlined } from '@ant-design/icons';
+import { Row, Col, Space, Button, Tag, Badge, Popconfirm, Typography } from 'antd';
+import { PlusOutlined } from '@ant-design/icons';
 import {
   INQUIRY_EXTERNALSTATE_COLOR,
   INQUIRY_INTERNALSTATE_COLOR,
   OFFTER_EXTERNALSTATE_TYPE,
-  OFFTER_INTERNALSTATE_TYPE
+  OFFTER_INTERNALSTATE_TYPE,
+  BUTTONAUTHORITY
 } from '../../constants';
 const { Text } = Typography;
 const AddInquiry = () => {
@@ -61,25 +62,20 @@ const AddInquiry = () => {
     dataIndex: 'operate',
     render: (text: any, record: any) => (
       <>
-        { (record.externalState !== OFFTER_EXTERNALSTATE_TYPE.WAITNOPASSINQUIRY_TYPE &&
-          (record.interiorState !== OFFTER_INTERNALSTATE_TYPE.AUDITNOPASS1_TYPE &&
-            record.interiorState !== OFFTER_INTERNALSTATE_TYPE.AUDITNOPASS2_TYPE))
-          && (
-            <Popconfirm title="确定要提交吗？" okText="是" cancelText="否" onConfirm={() => fetchSubmitBatch(record.id)}>
-              <Button type='link'>
-                提交
-              </Button>
-            </Popconfirm>
-          )}
-        <Button type='link' onClick={() => history.push(`/memberCenter/procurementAbility/purchaseInquiry/edit?id=${record.id}&number=${record.purchaseInquiryNo}`)}>修改</Button>
-        { record.interiorState === OFFTER_INTERNALSTATE_TYPE.WAITSUBMITAUDIT_TYPE
-          && (
-            <Popconfirm title="确定要删除吗？" okText="是" cancelText="否" onConfirm={() => fetchDeleteBatch(record.id)}>
-              <Button type='link'>
-                删除
-              </Button>
-            </Popconfirm>
-          )}
+        {(record.button === BUTTONAUTHORITY.ONE) &&
+          <Popconfirm title="确定要提交吗？" okText="是" cancelText="否" onConfirm={() => fetchSubmitBatch(record.id)}>
+            <Button type='link'>
+              提交
+            </Button>
+          </Popconfirm>}
+        {(record.button === BUTTONAUTHORITY.ONE || record.button === BUTTONAUTHORITY.TWO) &&
+          <Button type='link' onClick={() => history.push(`/memberCenter/procurementAbility/purchaseInquiry/edit?id=${record.id}&number=${record.purchaseInquiryNo}`)}>修改</Button>}
+        {(record.button === BUTTONAUTHORITY.ONE) &&
+          <Popconfirm title="确定要删除吗？" okText="是" cancelText="否" onConfirm={() => fetchDeleteBatch(record.id)}>
+            <Button type='link'>
+              删除
+            </Button>
+          </Popconfirm>}
       </>
     )
   }];

src/pages/transaction/purchaseAbility/purchaseInquiry/detail/index.tsx

@@ -12,9 +12,7 @@ import RecordLyout from '../../components/detail/components/recordLyout';
 import moment from 'moment';
 
 import {
-  OFFTER_EXTERNALSTATE,
   OFFTER_EXTERNALSTATE_COLOR,
-  OFFTER_INTERNALSTATE,
   OFFTER_INTERNALSTATE_COLOR
 } from '../../constants';
 import { CheckCircleOutlined, LinkOutlined, QuestionCircleOutlined } from '@ant-design/icons';
@@ -61,8 +59,8 @@ const DemandDetailed = () => {
       {
         col: [
           { label: '需求单号', extra: data.purchaseInquiryNo },
-          { label: '外部状态', extra: <Tag color={OFFTER_EXTERNALSTATE_COLOR[data.externalState]}>{OFFTER_EXTERNALSTATE[data.externalState]}</Tag> },
-          { label: '内部状态', extra: <Badge status={OFFTER_INTERNALSTATE_COLOR[data.interiorState]} text={OFFTER_INTERNALSTATE[data.interiorState]} /> },
+          { label: '外部状态', extra: <Tag color={OFFTER_EXTERNALSTATE_COLOR[data.externalState] || 'default'}>{data.externalStateName}</Tag> },
+          { label: '内部状态', extra: <Badge status={OFFTER_INTERNALSTATE_COLOR[data.interiorState] || 'default'} text={data.interiorStateName} /> },
           { label: '单据时间', extra: format(data.createTime,) },
         ]
       },

src/pages/transaction/purchaseAbility/purchaseInquiry/inquiry/index.tsx

@@ -88,6 +88,8 @@ const Inquiry = () => {
         columns={columns}
         effects="purchaseInquiryNo"
         fetch={PublicApi.getPurchasePurchaseInquiryList}
+        externalStatusFetch={PublicApi.getPurchasePurchaseInquiryExternalStatusPurchase}
+        interiorStatusFetch={PublicApi.getPurchasePurchaseInquiryInteriorStatusPurchase}
         reload={ref}
       />
       <ModalOperate

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

 import { ISchema} from '@formily/antd'
 import { FORM_FILTER_PATH } from '@/formSchema/const'
 import { PublicApi } from '@/services/api'
-import { FILTEREXTERNALSTATE, FILTERINTERNALSTATE, FILTERCONFIRMINTERNALSTATE } from '../constants'
 
 
 /** 采购询价 - 需求单查询 */
@@ -69,7 +68,7 @@ export const INQUIRYDEMANDORDER_SCHEMA: ISchema = {
                   width: 160
                 }
               },
-              enum: FILTEREXTERNALSTATE
+              enum: []
             },
             interiorState: {
               type: 'string',
@@ -79,7 +78,7 @@ export const INQUIRYDEMANDORDER_SCHEMA: ISchema = {
                   width: 160
                 }
               },
-              enum: FILTERINTERNALSTATE
+              enum: []
             },
           }
         },
@@ -607,9 +606,9 @@ export const CONFIRMOFFERSERAH_SCHEMA: ISchema = {
                   width: 160
                 }
               },
-              enum: FILTEREXTERNALSTATE
+              enum: []
             },
-            confirmInteriorState: {
+            interiorState: {
               type: 'string',
               "x-component-props": {
                 placeholder: '内部状态',
@@ -617,7 +616,7 @@ export const CONFIRMOFFERSERAH_SCHEMA: ISchema = {
                   width: 160
                 }
               },
-              enum: FILTERCONFIRMINTERNALSTATE
+              enum: []
             },
           }
         },
@@ -946,7 +945,7 @@ export const OFFERSERAH_SCHEMA: ISchema = {
                   width: 160
                 }
               },
-              enum: FILTEREXTERNALSTATE
+              enum: []
             },
             interiorState: {
               type: 'string',
@@ -956,7 +955,7 @@ export const OFFERSERAH_SCHEMA: ISchema = {
                   width: 160
                 }
               },
-              enum: FILTERINTERNALSTATE
+              enum: []
             },
           }
         },

src/utils/request.ts

@@ -120,8 +120,8 @@ class ApiRequest {
       baseRequest<IRequestSuccess<T>>(url, options).then(res => {
         // 登录验证
         if (res.code === 1101) {
-          // removeAuth()
-          // window.location.replace(`/user/login?redirect=${btoa(encodeURIComponent(String(window.location)))}`)
+          removeAuth()
+          window.location.replace(`/user/login?redirect=${btoa(encodeURIComponent(String(window.location)))}`)
           message.destroy()
           message.error(res.message)
           reject(res)