fix: 增加单位邮箱+修复软件锁服务记录点击客户详情不对问题

src/pages/Customer/Company/components/AddCompany/index.jsx

@@ -66,8 +66,7 @@ const AddCompanyModal = ({
                 }
                 formRef.current && formRef.current.setFieldsValue(values)
                 submit()
-              }}
-            >
+              }}>
               添加并关联
             </Button>
           ) : null
@@ -85,23 +84,20 @@ const AddCompanyModal = ({
         setValidStatusFcn('')
         !isNullOrUnDef(reload) && reload()
         return true
-      }}
-    >
+      }}>
       <Form.Item
         name="companyName"
         label="单位名称"
         validateStatus={validStatusFcn}
         hasFeedback
-        rules={[{ required: true, message: '请输入单位全称' }]}
-      >
+        rules={[{ required: true, message: '请输入单位全称' }]}>
         <CompanyFormItem validateFn={status => setValidStatusFcn(status)} />
       </Form.Item>
       {showDataItem ? <ProFormText name={`${dataType}Id`} hidden /> : null}
       <Form.Item
         name="districtIds"
         label="单位地区"
-        rules={[{ required: true, message: '请选择地区' }]}
-      >
+        rules={[{ required: true, message: '请选择地区' }]}>
         <LazyCascader showFooter={true} />
       </Form.Item>
       <ProFormText
@@ -114,7 +110,8 @@ const AddCompanyModal = ({
       <ProFormText name="address" label="单位地址" placeholder="" />
       <Row>
         <Col span={12}>
-          <ProFormText name="fax" label="单位传真" placeholder="" />
+          <ProFormText name="mail" label="单位邮箱" placeholder="" />
+          {/* <ProFormText name="fax" label="单位传真" placeholder="" /> */}
           <ProFormText name="ride" label="乘车路线" placeholder="" />
           <ProFormText name="stay" label="参考住宿" placeholder="" />
         </Col>

src/pages/Customer/Company/components/CompanyDetail/Form.jsx

@@ -68,6 +68,11 @@ const CompanyForm = props => {
       span: 24
     },
     {
+      dataIndex: 'mail',
+      label: '单位邮箱',
+      span: 24
+    },
+    {
       dataIndex: 'webservice',
       label: '网址',
       span: 24
@@ -122,8 +127,7 @@ const CompanyForm = props => {
             tagType={TagTypeEnum.PERSONTAG}
             tagColumn={TagDataTypeEnum.COMPANY}
             checkCallBack={refreshCompany}
-            modeType={LabelModeType.column}
-          >
+            modeType={LabelModeType.column}>
             <Add theme="filled" size="20" fill="#868e96" className="cursor-pointer" />
           </PersonLabel>
         </div>
@@ -150,8 +154,7 @@ const CompanyForm = props => {
             tagType={TagTypeEnum.TEAMTAG}
             tagColumn={TagDataTypeEnum.COMPANY}
             checkCallBack={refreshCompany}
-            modeType={LabelModeType.column}
-          >
+            modeType={LabelModeType.column}>
             <Add theme="filled" size="20" fill="#868e96" className="cursor-pointer" />
           </PersonLabel>
         </div>

src/pages/Customer/Company/index.jsx

@@ -284,6 +284,13 @@ const Company = props => {
       width: 125
     },
     {
+      title: '单位邮箱',
+      dataIndex: 'mail',
+      key: 'mail',
+      search: false,
+      with: 125
+    },
+    {
       title: '网址',
       dataIndex: 'webservice',
       key: 'webservice',
@@ -343,6 +350,9 @@ const Company = props => {
     fax: {
       show: false
     },
+    mail: {
+      show: false
+    },
     webservice: {
       show: false
     },

src/pages/Product/Lock/LockStore/components/LocksDetail/TabList.jsx

@@ -24,7 +24,7 @@ const LockTabList = props => {
     longle: {
       id: longleId,
       keyNum,
-      clientId,
+      // clientId,
       status,
       stockStatus,
       sellStatus,
@@ -66,7 +66,7 @@ const LockTabList = props => {
     }
   }
 
-  const handleClientClick = () => {
+  const handleClientClick = clientId => {
     toggleDrawer()
     setDrawerProps({
       closable: true,
@@ -173,7 +173,7 @@ const LockTabList = props => {
                         {servicelogEnum[item.status]}{' '}
                         <span
                           className="textPurple text-hex-967bbd cursor-pointer"
-                          onClick={handleClientClick}>
+                          onClick={() => handleClientClick(item.clientId)}>
                           {item.status !== 6 ? <>{item.client}</> : null}
                         </span>
                         <br />