'完善需求单状态和优化'

src/app.tsx

@@ -86,10 +86,10 @@ export function render(oldRender:Function) {
 export function onRouteChange({ routes, matchedRoutes, location, action }) {
   console.log('onRouteChange')
 
-  // if (isDev) {
-  //   console.log('dev')
-  //   return;
-  // }
+  if (isDev) {
+    console.log('dev')
+    return;
+  }
 
   if (whiteLists.includes(location.pathname)) {
     return

src/pages/requisition/aduit/components/index.tsx

@@ -3,7 +3,7 @@
  * @Date: 2020-08-24 11:39:11
  * @LastEditors: LeeJiancong
  * @Copyright: 1549414730@qq.com
- * @LastEditTime: 2020-09-25 14:48:05
+ * @LastEditTime: 2020-09-28 15:29:39
  */
 /**
  * @description: 组件描述: 一级 二级 待提交需求单
@@ -34,7 +34,7 @@ import {
 } from 'god/dist/src/standard-table/TableController';
 import EyePreview from '@/components/EyePreview';
 import StatusSwitch from '@/components/StatusSwitch';
-import {interiorState,interiorStateTwo,enquirySearchInteriorState} from '../../common/tableStatusList'
+import {interiorState,interiorStateTwo,enquirySearchInteriorState,enquirySearchexternalState2} from '../../common/tableStatusList'
 import statuStyle from '../../common/colorTag'
 import NiceForm from '@/components/NiceForm';
 import {timeRange} from '@/utils/index'
@@ -145,15 +145,8 @@ const List:React.FC<listParams> = (props) => {
       key:'externalState',
       dataIndex:'externalState',
       align:'center',
-      render: (text: any, reconds) => {
-        let component: ReactNode = null
-        if (text == 3) {
-          component = <><span style={statuStyle.warn}>审核不通过需求单</span></>
-        }else if (text == 1) {
-          component = <><span style={statuStyle.default}>待提交需求单</span></>
-        }
-        return component
-      }
+      render: (text: any, reconds) => 
+      enquirySearchexternalState2(text)
     },
     {
       title:'内部状态',
@@ -161,8 +154,6 @@ const List:React.FC<listParams> = (props) => {
       dataIndex:'interiorState',
       align:'center',
       render:(text:any) =>
-      // props.type === 1 ? interiorState(text) :
-      // props.type === 2 || props.type == 3? interiorStateTwo(text) : ''
       enquirySearchInteriorState(text)
     },
     {

src/pages/requisition/common/colorTag.ts

@@ -2,7 +2,7 @@
  * @Author: LeeJiancong
  * @Date: 2020-07-30 17:23:48
  * @LastEditors: LeeJiancong
- * @LastEditTime: 2020-07-30 17:24:49
+ * @LastEditTime: 2020-09-28 16:12:56
  */ 
 export default {
   default: {
@@ -25,7 +25,13 @@ export default {
   warn: {
     color: '#E63F3B',
     padding: '2px 5px',
-    background: 'rgba(255,235,230,1)',
+    background: 'rgb(255, 235, 230)',
+    borderRadius: '4px'
+  },
+  Error: {
+    color: 'red',
+    padding: '2px 5px',
+    background: 'rgba(255,247,227,1)',
     borderRadius: '4px'
   }
 }
\ No newline at end of file

src/pages/requisition/common/tableStatusList.tsx

 import React, { Component,ReactNode } from 'react';
 import {Badge} from 'antd'
+import statuStyle from './colorTag'
 /****** ***********************  需求单 ************************** */
 /**
  * @description: 需求提交一级
@@ -64,6 +65,20 @@ export const enquirySearchexternalState = (text:any) =>  {
   return component;
 }
 
+export const enquirySearchexternalState2 = (text:any) =>  {  
+  let component: ReactNode = null;
+  text === 1 ? component = <span style={statuStyle.default}>待提交需求单</span>:
+  text === 2 ? component = <span style={statuStyle.warn}>提交报价单</span>:
+  text === 3 ? component = <span style={statuStyle.confirm}>提交报价单</span>:
+  text === 4 ? component = <span style={statuStyle.confirm}>确认报价单</span>:
+  text === 5 ? component = <span style={statuStyle.success}>完成</span>:
+  text === 6 ? component = <span style={statuStyle.Error}>审核不通过</span>:
+  component = <span style={statuStyle.default}>取消报价单</span>
+  return component;
+}
+
+
+
 
 
 /****** *********************** 报价单 ************************** */