Merge branch 'feat/constructionOne' into feature/20230327_public_takeaway

* feat/constructionOne:
  feat: 合同样式修改
  feat: 检验

src/pages/businessManage/info/index.jsx

@@ -239,15 +239,25 @@ class BusinessInfo extends Component {
             }
           });
         }
-        obj.businessLicenseImage = imgs.businessLicenseImage[0].url;
-        obj.idCardEmblemImage = imgs.idCardEmblemImage[0].url;
-        obj.idCardPortraitImage = imgs.idCardPortraitImage[0].url;
-        obj.primaryImage = imgs.primaryImage[0].url;
-        obj.sealImage = imgs.sealImage[0].url;
-        obj.brandCertificate = imgs?.brandCertificate[0]?.url || '';
-        obj.differentNameAuthorizationImage = imgs?.differentNameAuthorizationImage[0]?.url || '';
-        obj.householdRegisterImage = imgs?.householdRegisterImage[0]?.url || '';
-        obj.icbProofImage = imgs?.icbProofImage[0]?.url || '';
+
+        obj.businessLicenseImage =
+          (imgs?.businessLicenseImage?.length && imgs?.businessLicenseImage[0].url) || '';
+        obj.idCardEmblemImage =
+          (imgs?.idCardEmblemImage?.length && imgs?.idCardEmblemImage[0].url) || '';
+        obj.idCardPortraitImage =
+          (imgs?.idCardPortraitImage?.length && imgs?.idCardPortraitImage[0].url) || '';
+        obj.primaryImage = (imgs?.primaryImage?.length && imgs?.primaryImage[0].url) || '';
+        obj.sealImage = (imgs?.sealImage?.length && imgs?.sealImage[0].url) || '';
+        // 新增
+        obj.brandCertificate =
+          (imgs?.brandCertificate?.length && imgs?.brandCertificate[0]?.url) || '';
+        obj.differentNameAuthorizationImage =
+          (imgs?.differentNameAuthorizationImage?.length &&
+            imgs?.differentNameAuthorizationImage[0]?.url) ||
+          '';
+        obj.householdRegisterImage =
+          (imgs?.householdRegisterImage?.length && imgs?.householdRegisterImage[0]?.url) || '';
+        obj.icbProofImage = (imgs?.icbProofImage?.length && imgs?.icbProofImage[0]?.url) || '';
 
         obj.applySource = 1;
         obj.signDateType = 1;

src/pages/contractView/index.jsx

@@ -3,6 +3,7 @@ import ProTable from '@ant-design/pro-table';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import { notification, Button, Modal, Image, message } from 'antd';
 import { query } from './services';
+import style from './style.less';
 
 const ContractView = () => {
   const [visible, setVisible] = useState(false);
@@ -74,23 +75,30 @@ const ContractView = () => {
   ];
   return (
     <PageHeaderWrapper>
-      <ProTable
-        search={{
-          collapsed: false,
-          collapseRender: () => null,
-        }}
-        columns={columns}
-        request={params => query({ ...params })}
-        rowKey={r => r.appealNo}
-        expandIconColumnIndex={10}
-        bordered
-        toolBarRender={false}
-        scroll={{ x: '100%', y: 400 }}
-        pagination={false}
-      />
-      <Modal visible={visible} width="1000px" onCancel={() => setVisible(false)}>
-        <iframe src={url} height="500" width="95%" title="合同"></iframe>
-      </Modal>
+      {!visible && (
+        <ProTable
+          search={{
+            collapsed: false,
+            collapseRender: () => null,
+          }}
+          columns={columns}
+          request={params => query({ ...params })}
+          rowKey={r => r.appealNo}
+          expandIconColumnIndex={10}
+          bordered
+          toolBarRender={false}
+          scroll={{ x: '100%', y: 400 }}
+          pagination={false}
+        />
+      )}
+      {visible && (
+        <div className={style.contract}>
+          <iframe src={url} height="500" width="95%" title="合同"></iframe>
+          <Button type="primary" onClick={() => setVisible(false)}>
+            取消
+          </Button>
+        </div>
+      )}
     </PageHeaderWrapper>
   );
 };

src/pages/contractView/style.less

+.contract {
+  text-align: center;
+}