fix: 处理定标相关页面状态显示异常，采购合同下单获取完成合同添加shopId字段

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

@@ -135,7 +135,7 @@ export const formSchema: ISchema = {
             { label: '其他类专家', value: 4 },
           ],
           "x-component-props": {
-            placeholder: '请输入所属行业'
+            placeholder: '请输入专家类型'
           },
           required: true,
         },

src/pages/procurement/callForBids/readyCheckedConfirmFirst/components/basicInfo/index.tsx

@@ -30,8 +30,8 @@ const BasicInfo: React.FC<IBasicInfo> = ({ title }) => {
       span: 8,
       fieldList: [
         { title: '招标编号:', name: 'code' },
-        { title: '外部状态:', name: 'inviteTenderOutStatus', render: (text) => BidOutStateTexts[text]},
-        { title: '内部状态:', name: 'inviteTenderInStatus', render: (text) => BidInStateTexts[text] },
+        { title: '外部状态:', name: 'inviteTenderOutStatusValue'},
+        { title: '内部状态:', name: 'inviteTenderInStatusValue'},
         { title: '发布时间:', name: 'createTime', render: (text) => formatTimeString(text) },
       ]
     },

src/pages/procurement/callForBids/readyCheckedConfirmSecond/components/basicInfo/index.tsx

@@ -30,8 +30,8 @@ const BasicInfo: React.FC<IBasicInfo> = ({ title }) => {
       span: 8,
       fieldList: [
         { title: '招标编号:', name: 'code' },
-        { title: '外部状态:', name: 'inviteTenderOutStatus', render: (text) => BidOutStateTexts[text]},
-        { title: '内部状态:', name: 'inviteTenderInStatus', render: (text) => BidInStateTexts[text] },
+        { title: '外部状态:', name: 'inviteTenderOutStatusValue'},
+        { title: '内部状态:', name: 'inviteTenderInStatusValue'},
         { title: '发布时间:', name: 'createTime', render: (text) => formatTimeString(text) },
       ]
     },

src/pages/procurement/callForBids/readyCheckedConfirmSecond/model/useSelfTable.tsx

@@ -80,7 +80,7 @@ export const useSelfTable = () => {
   const ref = useRef<any>({})
 
   const handleSubmit = async (record) => {
-    history.push(`/memberCenter/procurementAbility/callForBids/readyCheckedConfirmFirst/detail?id=${record.id}`)
+    history.push(`/memberCenter/procurementAbility/callForBids/readyCheckedConfirmSecond/detail?id=${record.id}`)
   }
   const secondColumns: any[] = baseBidListColumns.concat([
     {

src/pages/procurement/callForBids/readyConfirmBid/components/basicInfo/index.tsx

@@ -30,8 +30,8 @@ const BasicInfo: React.FC<IBasicInfo> = ({ title }) => {
       span: 8,
       fieldList: [
         { title: '招标编号:', name: 'code' },
-        { title: '外部状态:', name: 'inviteTenderOutStatus', render: (text) => BidOutStateTexts[text]},
-        { title: '内部状态:', name: 'inviteTenderInStatus', render: (text) => BidInStateTexts[text] },
+        { title: '外部状态:', name: 'inviteTenderOutStatusValue'},
+        { title: '内部状态:', name: 'inviteTenderInStatusValue'},
         { title: '发布时间:', name: 'createTime', render: (text) => formatTimeString(text) },
       ]
     },

src/pages/procurement/callForBids/readyPassBid/components/basicInfo/index.tsx

@@ -30,8 +30,8 @@ const BasicInfo: React.FC<IBasicInfo> = ({ title }) => {
       span: 8,
       fieldList: [
         { title: '招标编号:', name: 'code' },
-        { title: '外部状态:', name: 'inviteTenderOutStatus', render: (text) => BidOutStateTexts[text]},
-        { title: '内部状态:', name: 'inviteTenderInStatus', render: (text) => BidInStateTexts[text] },
+        { title: '外部状态:', name: 'inviteTenderOutStatusValue'},
+        { title: '内部状态:', name: 'inviteTenderInStatusValue'},
         { title: '发布时间:', name: 'createTime', render: (text) => formatTimeString(text) },
       ]
     },

src/pages/procurement/callForBids/tenderSearch/model/useSelfTable.tsx

@@ -60,7 +60,7 @@ export const useSelfTable = () => {
       align: 'left',
       dataIndex: 'isWin',
       key: 'isWin',
-      render: (text) => text ? '是' : '否'
+      render: (t, r) => (t === true) ? '是' : (t===false?'否': t)
     },
     {
       title: '外部状态',

src/pages/procurement/tender/tenderSearch/detail/index.tsx

@@ -25,10 +25,10 @@ const TenderSearchDetail: React.FC = () => {
     { title: '流转记录', id: 'transferRecord', componentName: "BidTransformRecord" },
   ]
 
-  // // 没有完成的标 隐藏中标结果、中标明细
-  // if(data?.inviteTender?.inviteTenderOutStatus !== BidOuterWorkState.Finish_Invite_Tender) {
-  //   anchorTitleList.splice(1, 2)
-  // }
+  // 没有完成的标 隐藏中标结果、中标明细
+  if(data?.isWin === null) {
+    anchorTitleList.splice(1, 2)
+  }
 
   return (
     <div>

src/pages/procurement/tender/tenderSearch/model/useSelfTable.tsx

@@ -72,7 +72,7 @@ export const useSelfTable = () => {
       align: 'left',
       dataIndex: 'isWin',
       key: 'isWin',
-      render: (t, r) => t ? '是' : '否'
+      render: (t, r) => (t === true) ? '是' : (t===false?'否': t)
     },
     {
       title: '外部状态',

src/pages/transaction/purchaseOrder/orderCollect/components/contractModalTable/index.tsx

@@ -58,6 +58,7 @@ const ContractModalTable:React.FC<ContractModalTableProps> = (props) => {
       schemaAction.setFieldValue('sourceType', item.sourceType)
       schemaAction.setFieldValue('purchaseType', 1)
       const { data } = await fetchOrderApi.getContractPurchaseMaterielList({
+        shopId: schemaAction.getFieldValue('shopId'),
         contractId: item.id,
         current: 1,
         pageSize: 999,

src/pages/transaction/purchaseOrder/orderCollect/index.tsx

@@ -417,6 +417,9 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
 
   // 选择合同
   const handleOrderContract = () => {
+    if(!addSchemaAction.getFieldValue('shopId')) {
+      return message.error('请先选择适应商城')
+    }
     contractOrderRef.current.setVisible(true)
   }