🐞 fix: 修改采购询价BUG

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') {
@@ -229,6 +231,7 @@ const ModalOperate: React.FC<IProps> = (props: any) => {
     } else {
       params.password = value.password;
     }
+    return
     fetch({ id, ...params }).then(res => {
       if (res.code === 1000) {
         onOk && onOk()

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/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: []
             },
           }
         },