feat: 合同-合同协同-新增'采购商合同编号'和'供应商合同编号'

src/pages/contract/components/detailCard/freight/index.tsx

@@ -72,8 +72,8 @@ const Freight: React.FC<Iprops> = ({
                 <Row gutter={[12, 12]}>
                     {
                         freightInfo?.map((item: any, index: number) => {
-                            return <Col span={12}>
-                                <div className={style.list} key={`col_${index + 1}`}>
+                            return <Col span={12} key={`col_${index + 1}`}>
+                                <div className={style.list}>
                                     <h5 className={style.listLable}>{item.label}</h5>
                                     <h5 className={style.listContent}>{item.extra}</h5>
                                 </div>

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

@@ -25,7 +25,7 @@ const coordinationList = () => {
   }
   //表头
   const columns: ColumnType<any>[] = [{
-    title: intl.formatMessage({ id: 'contract.hetongbianhaozhaiyao' }),
+    title: '采购商合同编号/摘要',
     dataIndex: 'contractNo',
     align: 'left',
     render: (text, record) =>
@@ -38,7 +38,13 @@ const coordinationList = () => {
         </EyePreview>
         <p>{record.contractAbstract}</p>
       </div>
-  }, {
+  },
+  {
+    title: '供应商合同编号',
+    dataIndex: 'supplierContractNumber',
+    align: 'left',
+  },
+  {
     title: intl.formatMessage({ id: 'contract.hetongshengxiaoshixiaoshi' }),
     dataIndex: 'startTime',
     align: 'left',

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

@@ -122,7 +122,17 @@ const Details = (props: any) => {
         const basicInfo: any = {
           col1: [
             {
-              label: intl.formatMessage({ id: 'contract.hetongbianhao' }),
+              label: '采购商合同编号',
+              extra: basics.contractNo ? basics.contractNo : '',
+              old:
+                type != 'implement' &&
+                  oldContractCoordinationDetailVO?.basics?.contractNo &&
+                  oldContractCoordinationDetailVO?.basics?.contractNo !== basics.contractNo
+                  ? oldContractCoordinationDetailVO?.basics?.contractNo
+                  : null,
+            },
+            {
+              label: '供应商合同编号',
               extra: basics.contractNo ? basics.contractNo : '',
               old:
                 type != 'implement' &&
@@ -807,6 +817,9 @@ const Details = (props: any) => {
           {
             type == 'Sign' &&
             <div>
+              <Form.Item label='' name="supplierContractNumber" rules={[{ required: true, message: '请输入供应商合同编号'}]}>
+                <Input placeholder={'请输入供应商合同编号'} />
+              </Form.Item>
               <p style={{ paddingTop: 10, paddingBottom: 10, }}>{intl.formatMessage({ id: 'contract.zhizhihetongyifangyi' })}</p>
               <Row style={{ marginBottom: 30, }}>
                 <Col span={24}>

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

@@ -25,8 +25,9 @@ const Sign = () => {
     return new Date(Date.parse(time.replace(/-/g, "/"))).getTime() / 1000;
   }
   //表头
-  const columns: ColumnType<any>[] = [{
-    title: intl.formatMessage({ id: 'contract.hetongbianhaozhaiyao' }),
+  const columns: ColumnType<any>[] = [
+  {
+    title: '采购商合同编号/摘要',
     dataIndex: 'contractNo',
     align: 'left',
     render: (text, record) =>
@@ -39,7 +40,13 @@ const Sign = () => {
         </EyePreview>
         <p>{record.contractAbstract}</p>
       </div>
-  }, {
+  },
+  {
+    title: '供应商合同编号',
+    dataIndex: 'supplierContractNumber',
+    align: 'left',
+  },
+  {
     title: intl.formatMessage({ id: 'contract.hetongshengxiaoshixiaoshi' }),
     dataIndex: 'startTime',
     align: 'left',

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

@@ -14,7 +14,7 @@ export const CoordinationSchema: ISchema = {
       type: 'string',
       "x-component": 'SearchFilter',
       'x-component-props': {
-        placeholder: intl.formatMessage({id: 'contract.qingshuruhetongbianhao'}),
+        placeholder: '请输入采购商合同编号',
         align: 'start',
       },
     },
@@ -35,6 +35,12 @@ export const CoordinationSchema: ISchema = {
             placeholder: intl.formatMessage({id: 'contract.qingshuruhetongzhaiyao'}),
           }
         },
+        supplierContractNumber: {
+          type: 'string',
+          'x-component-props': {
+            placeholder: '请输入供应商合同编号',
+          }
+        },
         "[startTime,endTime]": {
           type: 'array',
           "x-component": 'DateRangePickerUnix',
@@ -81,7 +87,7 @@ export const Schema: ISchema = {
       type: 'string',
       "x-component": 'SearchFilter',
       'x-component-props': {
-        placeholder: intl.formatMessage({id: 'contract.qingshuruhetongbianhao'}),
+        placeholder: '请输入采购商合同编号',
         align: 'start',
       },
     },
@@ -102,6 +108,12 @@ export const Schema: ISchema = {
             placeholder: intl.formatMessage({id: 'contract.qingshuruhetongzhaiyao'}),
           }
         },
+        supplierContractNumber: {
+          type: 'string',
+          'x-component-props': {
+            placeholder: '请输入供应商合同编号',
+          }
+        },
 
         "[startTime,endTime]": {
           type: 'array',
@@ -134,7 +146,7 @@ export const SchemaList: ISchema = {
       type: 'string',
       "x-component": 'SearchFilter',
       'x-component-props': {
-        placeholder: intl.formatMessage({id: 'contract.qingshuruhetongbianhao'}),
+        placeholder: '请输入采购商合同编号',
         align: 'start',
       },
     },
@@ -155,6 +167,12 @@ export const SchemaList: ISchema = {
             placeholder: intl.formatMessage({id: 'contract.qingshuruhetongzhaiyao'}),
           }
         },
+        supplierContractNumber: {
+          type: 'string',
+          'x-component-props': {
+            placeholder: '请输入供应商合同编号',
+          }
+        },
         "[startTime,endTime]": {
           type: 'array',
           "x-component": 'DateRangePickerUnix',

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

@@ -34,7 +34,7 @@ const Sign = () => {
   }
   //表头
   const columns: ColumnType<any>[] = [{
-    title: intl.formatMessage({ id: 'contract.hetongbianhaozhaiyao' }),
+    title: '采购商合同编号/摘要',
     dataIndex: 'contractNo',
     align: 'left',
     render: (text, record) =>
@@ -47,7 +47,13 @@ const Sign = () => {
         </EyePreview>
         <p>{record.contractAbstract}</p>
       </div>
-  }, {
+  },
+  {
+    title: '供应商合同编号',
+    dataIndex: 'supplierContractNumber',
+    align: 'left',
+  },
+  {
     title: intl.formatMessage({ id: 'contract.hetongshengxiaoshixiaoshi' }),
     dataIndex: 'startTime',
     align: 'left',