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

src/pages/procurement/components/descriptionsInfo/index.tsx

@@ -83,10 +83,11 @@ const DescriptionsInfo: React.FC<BasicInfoProps> = ({cardTitle, type}) => {
               }
               </p>
               {
-                data['inviteTenderAreaList']['length'] > 3 &&
+                data['inviteTenderAreaList']['length'] > 3 ?
                   <p onClick={toogleMore} style={{ cursor: 'pointer' }} className="commonPickColor">
                     展开{showMore ? <CaretDownOutlined /> : <CaretUpOutlined />}
                   </p>
+                : null
               }
             </>
           }
@@ -137,10 +138,11 @@ const DescriptionsInfo: React.FC<BasicInfoProps> = ({cardTitle, type}) => {
               }
               </p>
               {
-                data['inviteTenderAreaList']['length'] > 3 &&
+                data['inviteTenderAreaList']['length'] > 3 ?
                   <p onClick={toogleMore} style={{ cursor: 'pointer' }} className="commonPickColor">
                     展开{showMore ? <CaretDownOutlined /> : <CaretUpOutlined />}
                   </p>
+                : null
               }
             </>
           }
@@ -254,7 +256,7 @@ const DescriptionsInfo: React.FC<BasicInfoProps> = ({cardTitle, type}) => {
       span: 8,
       fieldList: [
         { title: '电子邮箱:', name: 'email', render: () => _data?.submitTenderRegister?.email },
-        { title: '单位地址:', name: 'address', render: () =>_data?.submitTenderRegister && `${_data.submitTenderRegister.provinceName}${_data.submitTenderRegister.cityName}${_data.submitTenderRegister.regionName}${_data.submitTenderRegister.address}` },
+        { title: '单位地址:', name: 'address', render: () =>_data?.submitTenderRegister ? `${_data.submitTenderRegister.provinceName}${_data.submitTenderRegister.cityName}${_data.submitTenderRegister.regionName}${_data.submitTenderRegister.address}` : null },
       ]
     }
   ]
@@ -269,7 +271,7 @@ const DescriptionsInfo: React.FC<BasicInfoProps> = ({cardTitle, type}) => {
           name: 'registerFile',
           render: (t, r) => (<div>
             {
-              _data?.submitTenderRegister && _data['submitTenderRegister']['registerFile'].map((_item, _i) => <p><a key={`registerFile${_i}`} target="_blank" href={_item.url}><FileFilled /> {_item.name}</a></p>)
+              _data?.submitTenderRegister ? _data['submitTenderRegister']['registerFile'].map((_item, _i) => <p><a key={`registerFile${_i}`} target="_blank" href={_item.url}><FileFilled /> {_item.name}</a></p>) : null
             }
           </div>)
         },

src/pages/procurement/tender/addTender/index.tsx

@@ -103,7 +103,9 @@ const AddTender:React.FC<AddTenderProps> = (props) => {
           }
           let param = {
             ...item,
-            inviteTenderMateriel: { id: item.inviteTenderMateriel.id },
+          }
+          if(item?.inviteTenderMateriel?.id) {
+            param.inviteTenderMateriel = { id: item.inviteTenderMateriel.id }
           }
           if(!value?.id) delete param.id
           return param