Merge branch 'feng-jinfa-20221102' into 'jinfa-20221102'

src/pages/authConfig/memberSystem/memberDetail.tsx

@@ -272,7 +272,7 @@ const MemberDetail: React.FC<{}> = () => {
         memberRoleId: id,
         source
       },
-      { useCache: true, ttl: 10 * 1000 },
+      // { useCache: true, ttl: 10 * 1000 },
     );
     return res;
   };

src/pages/balance/businessRequestFunds/search/index.tsx

@@ -122,7 +122,7 @@ const Search: React.FC = () => {
       const { data, response } = res
       if (response.status == 200) {
         // const suffixName = response.headers.get('content-disposition').split('.')[1]
-        const fileName = `${moment().format('YYYYMMDD')}请款单.xls`
+        const fileName = `${moment().format('YYYYMMDD')}请款单.zip`
         downFileByBuffer(data, fileName)
         ref.current.reloadCurrent()
       }

src/pages/balance/invoice/srm/joint/index.tsx

@@ -21,7 +21,7 @@ import {
   getSettleAccountsMemberSettlementAccountStatementCoordinationInvoiceList,
   postSettleAccountsMemberSettlementAccountStatementCoordinationInvoiceConfirm,
   postSettleAccountsMemberSettlementAccountStatementCoordinationInvoiceReturn,
-  postSettleAccountsMemberSettlementAccountStatementCoordinationExportNew
+  getSettleAccountsMemberSettlementAccountStatementCoordinationExportNew
 } from '@/services/SettleV2Api';
 import AuthButton from '@/components/AuthButton';
 import './index.less';
@@ -288,17 +288,17 @@ const InvoiceJoint: React.FC = () => {
   ];
 
   /* 导出 */
-  const handleExport = () => {
+  const handleExport = () => { 
     const { selectedRowKeys = [], setSelectedRowKeys, setSelectRow } = selectRowFns
     if (selectedRowKeys.length > 5000) {
       message.warning(intl.formatMessage({ id: 'balance.export.quantity.limit' }))
       return
     }
-    postSettleAccountsMemberSettlementAccountStatementCoordinationExportNew({ids: selectedRowKeys}, { responseType: 'blob', getResponse: true }).then((res: any) => {
+    getSettleAccountsMemberSettlementAccountStatementCoordinationExportNew({ids: selectedRowKeys.join(',')}, { responseType: 'blob', getResponse: true }).then((res: any) => {
       const { data, response } = res
       if (response.status == 200) {
-        const suffixName = response.headers.get('content-disposition').split('.')[1]
-        const fileName = `${moment().format('YYYYMMDD')}发票.${suffixName}`
+        // const suffixName = response.headers.get('content-disposition').split('.')[1]
+        const fileName = `${moment().format('YYYYMMDD')}发票.xls`
         downFileByBuffer(data, fileName)
         ref.current.reloadCurrent()
         setSelectedRowKeys([])

src/pages/contract/manage/editing/components/FormList.tsx

@@ -102,7 +102,7 @@ const FormList = (props: any) => {
               placeholder=""
               onChange={(e) => setInput(e, 'purchaseCount', index)}
               defaultValue={record.purchaseCount}
-              disabled={sourceType != 4}
+              disabled={[1,2,3].includes(sourceType)}  //询价/招标/竞价不能改
             />
           </Form.Item>
     },
@@ -119,7 +119,8 @@ const FormList = (props: any) => {
             style={{ width: 80 }}
             defaultValue={text === 0 || text === 1 ? text.toString() : ''}
             onChange={(e) => setInput(e, 'isHasTax', index)}
-            disabled={sourceType != 4}
+            disabled={[1,2,3].includes(sourceType)}  //询价/招标/竞价不能改
+
           >
             <Option value="0" key={0}>{intl.formatMessage({ id: 'contract.fou' })}</Option>
             <Option value="1" key={1}>{intl.formatMessage({ id: 'contract.shi' })}</Option>
@@ -145,7 +146,8 @@ const FormList = (props: any) => {
             defaultValue={text}
             onChange={(e) => setInput(e, 'taxRate', index)}
             addonAfter="%"
-            disabled={sourceType != 4}
+            disabled={[1,2,3].includes(sourceType)}  //询价/招标/竞价不能改
+
           />
         </Form.Item>
     },
@@ -168,7 +170,8 @@ const FormList = (props: any) => {
             onChange={(e) => setInput(e, 'price', index)}
             // addonBefore={intl.formatMessage({id: 'common.money'})}
             defaultValue={text}
-            disabled={sourceType != 4}
+            disabled={[1,2,3].includes(sourceType)}  //询价/招标/竞价不能改
+
           />
         </Form.Item>
     },
@@ -189,7 +192,7 @@ const FormList = (props: any) => {
               }}
               onChange={(e) => setInput(e, 'bidCount', index)}
               defaultValue={text ? text : ''}
-              disabled={sourceType != 4}
+              disabled={[1,2,3].includes(sourceType)}  //询价/招标/竞价不能改
             />
           </Form.Item>
     },
@@ -545,9 +548,11 @@ const FormList = (props: any) => {
     let res = newoldData.concat(handlePurchaseData(newData.filter(i => !i.existed)))
 
     let nowList = list?.length > 0 ? res : newoldData
-
+    console.log(list,'list');
+    
     nowList.map((i, k) => {
       i.newId = i.newId || i.prpId
+      i.deliveryType = i.deliveryMethod
       val_taxPoint(i)
       // i.isHasTax = form.getFieldValue('isHasTax' + i.newId) || undefined
       // i.taxRate = form.getFieldValue('taxRate' + i.newId) || ''

src/pages/transaction/purchaseRequisition/index.tsx

@@ -138,15 +138,15 @@ const RequestBill: React.FC<RequestBillProps> = () => {
       [intl.formatMessage({
         id: 'purchaseRequisition.quxiaodingdan',
         defaultMessage: '取消订单',
-      })]: record.showCancel,
+      })]: record.revokeProcessFlag===3,
       [intl.formatMessage({
         id: 'purchaseRequisition.zhongzhi',
         defaultMessage: '中止',
-      })]: record.showPause,
+      })]: record.revokeProcessFlag===2,
       [intl.formatMessage({
         id: 'purchaseRequisition.cehui',
         defaultMessage: '撤回审核',
-      })]: record.revokeProcessFlag,  
+      })]: record.revokeProcessFlag===1,  
       [intl.formatMessage({
         id: 'purchaseRequisition.biangeng',
         defaultMessage: '变更',