修改文案

src/pages/contract/contractexecution/details/detailedList.tsx

@@ -83,8 +83,8 @@ const DetailedList: React.FC<Iprops> = ({
       <div className='ant-card-head'>
         <div className='ant-card-head-wrapper'>
           <div className='ant-card-head-wrapper'>
-            请款统计
-              </div>
+            合同请款情况统计
+          </div>
         </div>
       </div>
       <div className='ant-card-body'>

src/pages/contract/coordination/coordinationList/index.tsx

@@ -59,6 +59,10 @@ const coordinationList = () => {
     title: '合同总金额',
     dataIndex: 'totalAmount',
     align: 'left',
+    render: (text) =>
+      <div>
+        <p>￥ {text}</p>
+      </div>
   },
   {
     title: '对应单据/寻源类型',

src/pages/contract/coordination/details/index.tsx

@@ -70,7 +70,7 @@ const Details = (props: any) => {
         let { basics, outerTaskStepList, innerTaskStepList, payPlanList, contractText } = res.data
         let contractAbstract = res.data.basics.contractAbstract;
         setsignatureLogId(basics.signatureLogId)
-        const basicInfo = {
+        const basicInfo: any = {
           col1: [
             { label: '合同编号', extra: basics.contractNo ? basics.contractNo : '', url: `/memberCenter/contract/manage/QueryList/QueryListdetails?contractId=${contractId}` },
             { label: '合同摘要', extra: basics.contractAbstract ? basics.contractAbstract : '' },
@@ -81,12 +81,30 @@ const Details = (props: any) => {
             { label: '寻源类型', extra: basics.sourceTypeName ? basics.sourceTypeName : '' },
             { label: '对应单据', extra: basics.sourceNo ? basics.sourceNo : '' },
             { label: '授标会员', extra: basics.partyAName ? basics.partyAName : '' },
-            { label: '授标金额', extra: basics.totalAmount ? basics.totalAmount : '' },
+            { label: '授标金额', extra: basics.totalAmount ? `￥${basics.totalAmount}` : '' },
           ],
           col3: [
             { label: '合同有效期：', extra: `${basics.startTime}至${basics.endTime}` },
           ],
         }
+        if (basics.sourceId) {
+          switch (basics.sourceType) {
+            case 1: {
+              if (basics.turn && basics.sourceId) {
+                basicInfo.col2[1].url = `/memberCenter/procurementAbility/confirmOffer/offerInquire/preview?id=${basics.sourceId}&turn=${basics.turn}`
+              }
+              break;
+            };
+            case 2: {
+              basicInfo.col2[1].url = `/memberCenter/procurementAbility/callForBids/callForBidsSearch/detail?id=${basics.sourceId}`
+              break;
+            };
+            case 3: {
+              basicInfo.col2[1].url = `/memberCenter/procurementAbility/purchaseBid/search/detail?id=${basics.sourceId}&number=${basics.sourceNo}`
+              break;
+            };
+          }
+        }
         setbasicInfo(basicInfo)
         setouterTaskStepList(outerTaskStepList)
         setinnerTaskStepList(innerTaskStepList)

src/pages/contract/coordination/implement/index.tsx

@@ -19,7 +19,9 @@ import { history } from 'umi';
 
 const Sign = () => {
   const ref = useRef<any>({});
-
+  const getdate = (time) => {
+    return new Date(Date.parse(time.replace(/-/g, "/"))).getTime() / 1000;
+  }
   //表头
   const columns: ColumnType<any>[] = [{
     title: '合同编号/摘要',
@@ -39,7 +41,7 @@ const Sign = () => {
     dataIndex: 'startTime',
     align: 'left',
     sorter: {
-      compare: (a, b) => a.demandPublishTime - b.demandPublishTime,
+      compare: (a, b) => getdate(a.startTime) - getdate(b.startTime),
       multiple: 1,
     },
     render: (text, record) =>

src/pages/contract/coordination/pageToBeExamineOne/index.tsx

@@ -64,6 +64,10 @@ const pageToBeExamineOne = () => {
     title: '合同总金额',
     dataIndex: 'totalAmount',
     align: 'left',
+    render: (text) =>
+      <div>
+        <p>￥ {text}</p>
+      </div>
   },
   {
     title: '对应单据/寻源类型',

src/pages/contract/coordination/pageToBeExamineTwo/index.tsx

@@ -63,6 +63,10 @@ const pageToBeExamineTwo = () => {
     title: '合同总金额',
     dataIndex: 'totalAmount',
     align: 'left',
+    render: (text) =>
+      <div>
+        <p>￥ {text}</p>
+      </div>
   },
   {
     title: '对应单据/寻源类型',

src/pages/contract/coordination/pageToBeSubmitExamine/index.tsx

@@ -61,6 +61,10 @@ const pageToBeSubmitExamine = () => {
     title: '合同总金额',
     dataIndex: 'totalAmount',
     align: 'left',
+    render: (text) =>
+      <div>
+        <p>￥ {text}</p>
+      </div>
   },
   {
     title: '对应单据/寻源类型',

src/pages/contract/coordination/sign/index.tsx

@@ -23,6 +23,9 @@ const Sign = () => {
   const [isPass, setIsAllMember] = useState()
   const [Visible, setIsModalVisible] = useState<boolean>(false)
   const [id, setid] = useState("")
+  const getdate = (time) => {
+    return new Date(Date.parse(time.replace(/-/g, "/"))).getTime() / 1000;
+  }
   //表头
   const columns: ColumnType<any>[] = [{
     title: '合同编号/摘要',
@@ -42,7 +45,7 @@ const Sign = () => {
     dataIndex: 'startTime',
     align: 'left',
     sorter: {
-      compare: (a, b) => a.demandPublishTime - b.demandPublishTime,
+      compare: (a, b) => getdate(a.startTime) - getdate(b.startTime),
       multiple: 1,
     },
     render: (text, record) =>
@@ -60,6 +63,10 @@ const Sign = () => {
     title: '合同总金额',
     dataIndex: 'totalAmount',
     align: 'left',
+    render: (text) =>
+      <div>
+        <p>￥ {text}</p>
+      </div>
   },
   {
     title: '对应单据/寻源类型',

src/pages/contract/funds/bill/index.tsx

@@ -30,7 +30,7 @@ const Bill: React.FC<{}> = () => {
   const columns: ColumnType<any>[] = [{
     title: '请款单号/摘要',
     dataIndex: 'applyNo',
-    align: 'center',
+    align: 'left',
     render: (text: any, record: any) => {
       return (
         <div>
@@ -45,18 +45,18 @@ const Bill: React.FC<{}> = () => {
     },
   }, {
     title: '单据时间',
-    align: 'center',
+    align: 'left',
     dataIndex: 'orderTime',
 
   }, {
     title: '收款方',
-    align: 'center',
+    align: 'left',
     dataIndex: 'payeeMemberName',
 
   },
   {
     title: '合同编号',
-    align: 'center',
+    align: 'left',
     dataIndex: 'contractNo',
     render: (text: any, record: any) => <EyePreview
       // type="button"
@@ -68,7 +68,7 @@ const Bill: React.FC<{}> = () => {
   },
   {
     title: '合同总金额',
-    align: 'center',
+    align: 'left',
     dataIndex: 'contractAmount',
     render: (text: any, record: any) =>
       <span>￥{text}</span>
@@ -76,14 +76,14 @@ const Bill: React.FC<{}> = () => {
   {
     title: '请款金额',
     dataIndex: 'applyAmount',
-    align: 'center',
+    align: 'left',
     render: (text: any, record: any) =>
       <span>￥{text}</span>
   },
   {
     title: '内部状态',
     dataIndex: 'statusName',
-    align: 'center',
+    align: 'left',
     render: (text: any, record: any) => {
       let component: ReactNode = null
       component = (
@@ -97,7 +97,7 @@ const Bill: React.FC<{}> = () => {
   }, {
     title: '操作',
     dataIndex: 'action',
-    align: 'center',
+    align: 'left',
 
     render: (text: any, record: any) => {
       // 作废：待付款、已付款、待提交审核状态的不能作废

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

@@ -71,19 +71,19 @@ const FormList = (props: any) => {
       parmas.memberId = Row.partyBMemberId;
       parmas.memberRoleId = Row.partyBRoleId;
       fn = PublicApi.getPurchaseQuotedPriceProductlistListContract
-      console.log(sourceType)
     }
 
     if (sourceType == '2') {
       parmas.submitTenderId = Row.bidId;
       fn = PublicApi.getPurchaseSubmitTenderMaterielGetSubmitTenderMaterielList
     } else {
-
+      fn = PublicApi.getProductGoodsGetGoodsList
     }
     console.log(sourceType)
 
     fn(parmas).then(res => {
       console.log(res);
+      // return;
       if (res.code === 1000) {
         let data = res.data.data.map(item => {
           return {

src/pages/contract/manage/auction/index.tsx

@@ -21,6 +21,7 @@ const Auction = () => {
   const [selectedRowKeys, setSelectedRowKeys] = useState<Array<string>>([])
   const [selectRow, setSelectRow] = useState<any[]>([]) // 模态框选择的行数据
   //表头
+
   const columns: ColumnType<any>[] = [{
     title: '竞价单号',
     dataIndex: 'viePriceNO',
@@ -55,7 +56,7 @@ const Auction = () => {
     dataIndex: 'awardTime',
     align: 'left',
     sorter: {
-      compare: (a, b) => a.bidWinnerNoticeTime - b.bidWinnerNoticeTime,
+      compare: (a, b) => getdate(a.awardTime) - getdate(b.awardTime),
       multiple: 1,
     },
   },
@@ -64,9 +65,16 @@ const Auction = () => {
     dataIndex: 'awardAmount',
     align: 'left',
     sorter: {
-      compare: (a, b) => a.bidWinnerAmount - b.bidWinnerAmount,
+      compare: (a, b) => a.awardAmount - b.awardAmount,
       multiple: 1,
     },
+    render: (text) => {
+      return (
+        <div>
+          ￥{text}
+        </div>
+      )
+    }
   },
   {
     title: '外部状态',
@@ -98,12 +106,14 @@ const Auction = () => {
       return (
         <div>
           <span style={{ color: '#00B37A', cursor: 'pointer', marginRight: 10 }} onClick={() => history.push(`/memberCenter/contract/manage/add/addList/contracAdd?contractId=${record.id}&sourceType=3`)}>创建采购竞价合同</span>
-          <span style={{ color: '#00B37A', cursor: 'pointer' }} onClick={() => history.push(`/memberCenter/contract/manage/Auction/details?contractId=${record.id}`)}> 查看 </span>
+          {/* <span style={{ color: '#00B37A', cursor: 'pointer' }} onClick={() => history.push(`/memberCenter/contract/manage/Auction/details?contractId=${record.id}`)}> 查看 </span> */}
         </div>
       )
     }
   }]
-
+  const getdate = (time) => {
+    return new Date(Date.parse(time.replace(/-/g, "/"))).getTime() / 1000;
+  }
   // 列表数据
   const fetchData = (params?: any) => {
     params.startTime = params.startTime ? moment(Number(params.startTime)).format('YYYY-MM-DD') : '';

src/pages/contract/manage/bidding/index.tsx

@@ -50,7 +50,7 @@ const BiddingList = () => {
     dataIndex: 'bidWinnerNoticeTime',
     align: 'left',
     sorter: {
-      compare: (a, b) => a.bidWinnerNoticeTime - b.bidWinnerNoticeTime,
+      compare: (a, b) => getdate(a.bidWinnerNoticeTime) - getdate(b.bidWinnerNoticeTime),
       multiple: 1,
     },
   },
@@ -105,7 +105,9 @@ const BiddingList = () => {
       )
     }
   }]
-
+  const getdate = (time) => {
+    return new Date(Date.parse(time.replace(/-/g, "/"))).getTime() / 1000;
+  }
   const Like = (record) => {
 
     record.sourceId = record.inviteBidId;

src/pages/contract/manage/details/index.tsx

@@ -76,7 +76,7 @@ const Details = (props: any) => {
         let { basics, outerTaskStepList, innerTaskStepList, payPlanList, contractText } = res.data
         let contractAbstract = res.data.basics.contractAbstract;
         setsignatureLogId(basics.signatureLogId ? basics.signatureLogId : '')
-        const basicInfo = {
+        const basicInfo: any = {
           col1: [
             { label: '合同编号：', extra: basics.contractNo ? basics.contractNo : '' },
             { label: '合同摘要：', extra: basics.contractAbstract ? basics.contractAbstract : '' },
@@ -85,14 +85,33 @@ const Details = (props: any) => {
           ],
           col2: [
             { label: '寻源类型：', extra: basics.sourceTypeName ? basics.sourceTypeName : '' },
-            { label: '对应单据：', extra: basics.sourceNo ? basics.sourceNo : '' },
+            { label: '对应单据：', extra: basics.sourceNo ? basics.sourceNo : '', },
             { label: '授标会员：', extra: basics.partyBName ? basics.partyBName : '' },
-            { label: '授标金额', extra: basics.totalAmount ? basics.totalAmount : '' },
+            { label: '授标金额', extra: basics.totalAmount ? `￥${basics.totalAmount}` : '' },
           ],
           col3: [
             { label: '合同有效期：', extra: `${basics.startTime}至${basics.endTime}` },
           ],
         }
+
+        if (basics.sourceId) {
+          switch (basics.sourceType) {
+            case 1: {
+              if (basics.turn && basics.sourceId) {
+                basicInfo.col2[1].url = `/memberCenter/procurementAbility/confirmOffer/offerInquire/preview?id=${basics.sourceId}&turn=${basics.turn}`
+              }
+              break;
+            };
+            case 2: {
+              basicInfo.col2[1].url = `/memberCenter/procurementAbility/callForBids/callForBidsSearch/detail?id=${basics.sourceId}`
+              break;
+            };
+            case 3: {
+              basicInfo.col2[1].url = `/memberCenter/procurementAbility/purchaseBid/search/detail?id=${basics.sourceId}&number=${basics.sourceNo}`
+              break;
+            };
+          }
+        }
         setbasicInfo(basicInfo)
         setStepList(outerTaskStepList);
         setouterTaskStepList(outerTaskStepList)
@@ -141,34 +160,77 @@ const Details = (props: any) => {
   }
   /*查询合同详情-分页查询合同采购物料*/
   const columns: any = [
-    { title: '物料编号/名称', dataIndex: 'materielNo', align: 'center', },
+    {
+      title: '物料编号/名称', dataIndex: 'materielNo', align: 'center', render: (text, item) => {
+        return (
+          <div>
+            <p> {text}</p>
+            <p>{item.materielName}</p>
+          </div>
+        )
+
+      }
+    },
     { title: '规格型号', dataIndex: 'type', align: 'center', },
     { title: '品类', dataIndex: 'category', align: 'center', },
     { title: '品牌', dataIndex: 'brand', align: 'center', },
     { title: '单位', dataIndex: 'unit', align: 'center', },
     { title: '采购数量', dataIndex: 'purchaseCount', align: 'center', },
     { title: '含税', dataIndex: 'isHasTaxName', align: 'center', },
-    { title: '税率', dataIndex: 'taxRate', align: 'center', },
-    { title: '单价(含税)', dataIndex: 'price', align: 'center', },
+    {
+      title: '税率', dataIndex: 'taxRate', align: 'center',
+      render: (text) => {
+        return (
+          <div>
+            %{text}
+          </div>
+        )
+      }
+    },
+    {
+      title: '单价(含税)', dataIndex: 'price', align: 'center',
+      render: (text) => {
+        return (
+          <div>
+            ￥{text}
+          </div>
+        )
+      }
+    },
     {
       dataIndex: 'bidCount', align: 'center',
       title: (item) => {
         return (
           <Space direction='vertical'>
             <Text>授标数量</Text>
-            <Text>合计: ￥{tobidCount}</Text>
+            <Text>合计: {tobidCount}</Text>
           </Space>
         )
+      },
+      render: (text) => {
+        return (
+          <div>
+            ￥{text}
+          </div>
+        )
       }
+
     },
     {
       dataIndex: 'bidAmount', align: 'center',
       title: (
         <Space direction='vertical'>
           <Text>金额(不含税)</Text>
-          <Text>合计: ￥{bidAmount}</Text>
+          <Text>合计: {bidAmount}</Text>
         </Space>
       ),
+      render: (text) => {
+        return (
+          <div>
+            ￥{text}
+          </div>
+        )
+      }
     },
   ];
   const fetchListData = (params) => {
@@ -364,7 +426,7 @@ const Details = (props: any) => {
           <div className='ant-card-head'>
             <div className='ant-card-head-wrapper'>
               <div className='ant-card-head-wrapper'>
-                采购材料
+                合同采购材料
               </div>
             </div>
           </div>

src/pages/contract/manage/examine/index.tsx

@@ -10,6 +10,7 @@ import EyePreview from '@/components/EyePreview'
 import { FORM_FILTER_PATH } from '@/formSchema/const'
 import { examineSchema } from '../schema'
 import StatusTag from '@/components/StatusTag';
+import { history, Redirect } from 'umi';
 import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
 import Submit from '@/components/NiceForm/components/Submit'
 import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
@@ -121,7 +122,7 @@ const Examine = () => {
     render: (text, record) => {
       return (
         <div>
-          <span style={{ color: '#00B37A', cursor: 'pointer', marginRight: 10 }} onClick={() => submitExamine(record.id)}>提交审核</span>
+          <span style={{ color: '#00B37A', cursor: 'pointer', marginRight: 10 }} onClick={() => history.push(`/memberCenter/contract/manage/examine/details?contractId=${record.id}&type=ManageSubmitExamine`)}>提交审核</span>
         </div>
       )
     }

src/pages/contract/manage/levelexamine/index.tsx

@@ -13,6 +13,7 @@ import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilte
 import Submit from '@/components/NiceForm/components/Submit'
 import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
 import { PublicApi } from '@/services/api';
+import { history, Redirect } from 'umi';
 import { PlayCircleOutlined, PoweroffOutlined } from '@ant-design/icons'
 import ExamineFrom from '../../components/examine'
 import moment from 'moment';
@@ -123,7 +124,7 @@ const Levelexamine = () => {
     render: (text, record) => {
       return (
         <div>
-          <span style={{ color: '#00B37A', cursor: 'pointer', marginRight: 10 }} onClick={() => submitExamine(record.id)}>审核</span>
+          <span style={{ color: '#00B37A', cursor: 'pointer', marginRight: 10 }} onClick={() => history.push(`/memberCenter/contract/manage/levelexamine/details?contractId=${record.id}&type=ManageExamineStepOne`)}>审核</span>
         </div>
       )
     }

src/pages/contract/manage/schema/index.ts

@@ -155,7 +155,7 @@ export const ViePriceListSchema: any = {
       type: 'string',
       "x-component": 'SearchFilter',
       'x-component-props': {
-        placeholder: '请输入搜索需求单号',
+        placeholder: '请输入搜索竞价单号',
         align: 'start',
       },
     },

src/pages/contract/manage/secondaryexamine/index.tsx

@@ -15,6 +15,7 @@ import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePicke
 import { PublicApi } from '@/services/api';
 import ExamineFrom from '../../components/examine'
 import moment from 'moment';
+import { history, Redirect } from 'umi';
 
 const Secondaryexamine = () => {
   const ref = useRef<any>({});
@@ -118,7 +119,7 @@ const Secondaryexamine = () => {
     render: (text, record) => {
       return (
         <div>
-          <span style={{ color: '#00B37A', cursor: 'pointer', marginRight: 10 }} onClick={() => submitExamine(record.id)}>提交审核</span>
+          <span style={{ color: '#00B37A', cursor: 'pointer', marginRight: 10 }} onClick={() => history.push(`/memberCenter/contract/manage/secondaryexamine/details?contractId=${record.id}&type=PageToBeExamineStepTwo`)}>提交审核</span>
         </div>
       )
     }

src/pages/contract/manage/signacontract/index.tsx

@@ -16,6 +16,7 @@ import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePicke
 import { PublicApi } from '@/services/api';
 import moment from 'moment';
 import '../../constants/index.less'
+
 const Signacontract = () => {
   const ref = useRef<any>({});
   const [selectedRowKeys, setSelectedRowKeys] = useState<Array<string>>([])