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

src/components/NiceForm/components/MultAddress.tsx

@@ -47,8 +47,6 @@ const MultAddress = (props) => {
   // 是否仅读
   const { readOnly = null } = props.props
 
-  console.log(_v, 'value')
-
   let value = null
   if(!_v.length) {
     value = [{ provinceCode: null, province: null, cityCode: null, city: null }]

src/pages/procurement/callForBids/addNewBid/index.tsx

@@ -49,6 +49,7 @@ const AddNewBid:React.FC<AddNewBidProps> = (props) => {
   const [btnLoading, setBtnLoading] = useState(false)
   const { pageStatus, id } = usePageStatus()
   const [initFormValue, setInitFormValue] = useState<any>({})
+  const publicFlag = useRef<boolean>(false)
 
   // 会员列
   const [memberColumn, setMemberColumn] = useState<any>(() => {
@@ -90,16 +91,13 @@ const AddNewBid:React.FC<AddNewBidProps> = (props) => {
       } else {
         return item
       }
-    } ))
+    }))
   }
 
   const handleSubmit = async (value) => {
-    console.log(value, '87')
     setBtnLoading(true)
     const params = paramsConversionFn(value)
 
-    console.log(params, '91')
-
     if(!params.isQualificationCheck) {
       delete params.preCheckStartTime
       delete params.preCheckEndTime
@@ -201,8 +199,11 @@ const AddNewBid:React.FC<AddNewBidProps> = (props) => {
 
                 $('onFieldValueChange', 'inviteTenderType').subscribe(state => {
                   if(state.value === PUBLIC_BID) {
-                    publicRef.current.setVisible(true)
-
+                    if(pageStatus === PageStatus.EDIT && !publicFlag.current) {
+                      publicRef.current.setVisible(false)
+                    } else {
+                      publicRef.current.setVisible(true)
+                    }
                   } else if(state.value === SYSTEM_BID) {
                     // @todo 需调用后台接口获取匹配的会员数据
                     // addSchemaAction.setFieldState('memberList', state => {
@@ -211,6 +212,11 @@ const AddNewBid:React.FC<AddNewBidProps> = (props) => {
                   } else if(state.value === INVITE_BID) {
 
                   }
+
+                  if(pageStatus === PageStatus.ADD) {
+                    ctx.setFieldState('*(memberName, inviteTenderInStatus, tenderOutStatus, createTime)', state => state.props.visible = true)
+                  }
+
                 })
 
                 $('onFieldValueChange', 'isQualificationCheck').subscribe(state => {

src/pages/procurement/callForBids/addNewBid/schema/index.ts

@@ -161,21 +161,25 @@ const basicInfo: ISchema = {
           type: 'string',
           title: '招标会员',
           readOnly: true,
+          visible: false,
         },
         inviteTenderInStatus: {
           type: 'string',
           title: '内部状态',
           readOnly: true,
+          visible: false,
         },
         tenderOutStatus: {
           type: 'string',
           title: '外部状态',
           readOnly: true,
+          visible: false,
         },
         createTime: {
           type: 'string',
           title: '发布时间',
           readOnly: true,
+          visible: false,
         },
         isEdit: {
           type: 'boolean',

src/pages/procurement/callForBids/callForBidsSearch/index.tsx

@@ -146,7 +146,7 @@ const callForBidsSearch: React.FC<{}> = () => {
                 useStateFilterSearchLinkageEffect(
                   $,
                   actions,
-                  'code',
+                  'inviteTenderCode',
                   FORM_FILTER_PATH,
                 );
               },

src/pages/procurement/callForBids/callForBidsSearch/schema/index.ts

@@ -8,7 +8,7 @@ import { BidInStateTexts, BidOutStateTexts } from '@/constants';
 export const tableListSchema: ISchema = {
   type: 'object',
   properties: {
-    code: {
+    inviteTenderCode: {
       type: 'string',
       "x-component": 'SearchFilter',
       'x-component-props': {
@@ -69,7 +69,7 @@ export const tableListSchema: ISchema = {
             value: item,
           }))
         },
-        "[preCheckStartTime,preCheckEndTime]": {
+        "[checkStartTime,checkEndTime]": {
           type: 'array',
           "x-component": 'DateRangePickerUnix',
           'x-component-props': {

src/pages/procurement/components/customTag.tsx

@@ -31,6 +31,13 @@ const mapColor = [
   "rgb(101, 84, 192)", // 紫
   "rgb(230, 63, 59)", // 红
   "rgb(0, 179, 122)", // 绿
+
+  "rgb(96, 98, 102)", // 灰
+  "rgb(255, 153, 31)", // 黄
+  "rgb(63, 126, 210)", // 蓝
+  "rgb(101, 84, 192)", // 紫
+  "rgb(230, 63, 59)", // 红
+  "rgb(0, 179, 122)", // 绿
 ]
 
 // 订单内部状态显示