Merge branch 'develop' of ssh://code.linyikj.com.cn:2222/pay/pay-company into develop

* 'develop' of ssh://code.linyikj.com.cn:2222/pay/pay-company:
  fix：工单修复

src/pages/customer/house_registers_audit/index.tsx

@@ -5,6 +5,7 @@ import { ProTable } from '@ant-design/pro-components';
 import { Space } from 'antd';
 import { useNavigate } from 'umi';
 import Audit from './modals/Audit';
+import Show from './modals/Show';
 
 export default function Index({ title = '登记审核' }) {
   const navigate = useNavigate();
@@ -89,6 +90,7 @@ export default function Index({ title = '登记审核' }) {
             render: (_, item: any, index, action) => (
               <Space key={index}>
                 <Audit item={item} reload={action?.reload} title={title} />
+                <Show item={item} title={title} />,
               </Space>
             ),
           }),

src/pages/customer/house_registers_audit/modals/Show.tsx

@@ -0,0 +1,232 @@
+import {
+  MyBetaModalFormProps,
+  MyButtons,
+  MyColumns,
+  MyModalFormProps,
+  MyProTableProps,
+  renderTextHelper,
+} from '@/common';
+
+import {
+  HouseOccupantsCardTypeEnum,
+  HouseOccupantsResidentialRelationEnum,
+  HouseRegistersTypeEnum,
+} from '@/gen/Enums';
+import {
+  BetaSchemaForm,
+  ProCard,
+  ProDescriptions,
+  ProTable,
+} from '@ant-design/pro-components';
+import { useNavigate } from '@umijs/max';
+import { Form, Image, Space } from 'antd';
+export default function Show(props: MyBetaModalFormProps) {
+  const [form] = Form.useForm();
+  const navigate = useNavigate();
+
+  return (
+    <BetaSchemaForm<ApiTypes.Archive.HouseRegisters.Show>
+      {...MyModalFormProps.props}
+      title={props.title}
+      trigger={<MyButtons.Default title="查看" type="primary" />}
+      wrapperCol={{ span: 24 }}
+      width="800px"
+      modalProps={{
+        bodyStyle: { maxHeight: '70vh', overflowY: 'auto' },
+      }}
+      key={new Date().getTime()}
+      form={form}
+      columns={[
+        {
+          // title: '登记信息',
+          dataIndex: 'info_display',
+          valueType: 'text',
+          renderFormItem: () => (
+            <Space direction="vertical" style={{ width: '100%' }}>
+              <ProCard size="small">
+                <ProDescriptions bordered size="small" column={1}>
+                  <ProDescriptions.Item label="房屋信息">
+                    <a
+                      onClick={() =>
+                        navigate(
+                          `/customer/archive/show/${props?.item?.model_id}`,
+                        )
+                      }
+                    >
+                      {props?.item?.asset_house?.full_name || '-'}
+                    </a>
+                  </ProDescriptions.Item>
+                  <ProDescriptions.Item label="登记类型">
+                    <renderTextHelper.Tag
+                      Enums={HouseRegistersTypeEnum}
+                      value={props?.item?.type}
+                    />
+                  </ProDescriptions.Item>
+
+                  <ProDescriptions.Item label="申请时间">
+                    {props?.item?.created_at || '-'}
+                  </ProDescriptions.Item>
+                </ProDescriptions>
+              </ProCard>
+
+              {props?.item?.customer_info &&
+                props?.item?.customer_info?.length > 0 && (
+                  <ProCard size="small">
+                    <ProTable
+                      {...MyProTableProps.props}
+                      search={false}
+                      toolBarRender={false}
+                      pagination={false}
+                      dataSource={props?.item?.customer_info}
+                      rowKey={(record, index) => record?.id_card || index}
+                      size="small"
+                      columns={[
+                        MyColumns.EnumTag({
+                          title: '关联身份',
+                          dataIndex: 'residential_relation',
+                          valueEnum: HouseOccupantsResidentialRelationEnum,
+                        }),
+                        {
+                          title: '姓名',
+                          dataIndex: 'name',
+                        },
+                        {
+                          title: '手机号',
+                          dataIndex: 'phone',
+                        },
+                        MyColumns.EnumTag({
+                          title: '证件类型',
+                          dataIndex: 'card_type',
+                          valueEnum: HouseOccupantsCardTypeEnum,
+                        }),
+                        {
+                          title: '证件号码',
+                          dataIndex: 'id_card',
+                        },
+                        {
+                          title: '证件资料',
+                          render: (_, item) => {
+                            return (
+                              <Space>
+                                {item?.card_front_image?.[0] && (
+                                  <Image
+                                    height={30}
+                                    style={{
+                                      width: 'auto',
+                                      objectFit: 'contain',
+                                    }}
+                                    src={item?.card_front_image[0]?.url}
+                                    placeholder="正面"
+                                  />
+                                )}
+                                {item?.card_back_image?.[0] && (
+                                  <Image
+                                    height={30}
+                                    style={{
+                                      width: 'auto',
+                                      objectFit: 'contain',
+                                    }}
+                                    src={item?.card_back_image[0]?.url}
+                                    placeholder="反面"
+                                  />
+                                )}
+                              </Space>
+                            );
+                          },
+                        },
+                      ]}
+                    />
+                  </ProCard>
+                )}
+              {(props?.item?.type === 'UpdateInfo' ||
+                props?.item?.type === 'UpdatePhone') && (
+                <ProCard title="更新信息" size="small">
+                  <ProTable
+                    {...MyProTableProps.props}
+                    search={false}
+                    toolBarRender={false}
+                    pagination={false}
+                    dataSource={[props?.item?.update_info]}
+                    rowKey={(record, index) => record?.id_card || index}
+                    size="small"
+                    columns={[
+                      {
+                        title: '姓名',
+                        dataIndex: 'name',
+                      },
+                      {
+                        title: '手机号',
+                        dataIndex: 'phone',
+                      },
+                      MyColumns.EnumTag({
+                        title: '证件类型',
+                        dataIndex: 'card_type',
+                        valueEnum: HouseOccupantsCardTypeEnum,
+                      }),
+                      {
+                        title: '证件号码',
+                        dataIndex: 'id_card',
+                      },
+                      {
+                        title: '证件资料',
+                        render: (_, item) => {
+                          return (
+                            <Space>
+                              {item?.card_front_image?.[0] && (
+                                <Image
+                                  height={30}
+                                  style={{
+                                    width: 'auto',
+                                    objectFit: 'contain',
+                                  }}
+                                  src={item?.card_front_image[0]?.url}
+                                  placeholder="正面"
+                                />
+                              )}
+                              {item?.card_back_image?.[0] && (
+                                <Image
+                                  height={30}
+                                  style={{
+                                    width: 'auto',
+                                    objectFit: 'contain',
+                                  }}
+                                  src={item?.card_back_image[0]?.url}
+                                  placeholder="反面"
+                                />
+                              )}
+                            </Space>
+                          );
+                        },
+                      },
+                    ]}
+                  />
+                </ProCard>
+              )}
+              {props?.item?.type === 'AddOwner' &&
+                props?.item?.ownership_info &&
+                props?.item?.ownership_info?.length > 0 && (
+                  <ProCard title="产证信息" size="small">
+                    <Image.PreviewGroup>
+                      <Space wrap>
+                        {props?.item?.ownership_info?.map(
+                          (res: any, index: number) => (
+                            <Image
+                              key={`${res?.name}_${index}`}
+                              height={50}
+                              src={res?.url || ''}
+                              placeholder="产证资料"
+                            />
+                          ),
+                        )}
+                      </Space>
+                    </Image.PreviewGroup>
+                  </ProCard>
+                )}
+            </Space>
+          ),
+          colProps: { span: 24 },
+        },
+      ]}
+    />
+  );
+}

src/pages/work_order/list/index.tsx

@@ -16,7 +16,7 @@ import {
 } from '@/gen/Enums';
 import { ProTable } from '@ant-design/pro-components';
 import { useSearchParams } from '@umijs/max';
-import { Dropdown, Space, Tooltip } from 'antd';
+import { Space, Tooltip } from 'antd';
 import WorkOrderAssign from './modals/WorkOrderAssign';
 import WorkOrderCreate from './modals/WorkOrderCreate';
 import WorkOrderShow from './modals/WorkOrderShow';
@@ -28,72 +28,63 @@ export default function Index({ title = '报修报事' }) {
   let toolBarRender = (action: any) => {
     return getCurrentPermissions({
       create: (
-        <WorkOrderCreate
+        <WorkOrderCreate key="Create" reload={action?.reload} title={title} />
-          key="Create"
-          reload={action?.reload}
-          title={title}
-          item={{
-            typeEnum: () => {
-              let obj: any = JSON.parse(
-                JSON.stringify(HouseWorkOrdersTypeEnum),
-              );
-
-              delete obj.EquipmentMaintenance;
-              delete obj.Emergency;
-              delete obj.EmergEquipmentMaintenancency;
-              delete obj.SecurityInspection;
-              delete obj.Complaint;
-              delete obj.QualityCheck;
-              return obj;
-            },
-          }}
-        />
       ),
     });
   };
   let tableRender = (item: any, action: any) => {
     let permissions = getCurrentPermissions({
-      assign: (
+      show: <WorkOrderShow item={item} title="详情" reload={action?.reload} />,
-        <WorkOrderAssign item={item} reload={action?.reload} title="指派" />
+      update: (
-      ),
+        <>
-      completed: (
+          <WorkOrderUpdate
-        <WorkOrderShow item={item} title="回访" reload={action?.reload} />
+            item={{
-      ),
+              ...item,
-    });
+              typeEnum: () => {
-
+                let obj: any = JSON.parse(
-    let permissionsSpace = getCurrentPermissions({
+                  JSON.stringify(HouseWorkOrdersTypeEnum),
-      show: {
+                );
-        key: '1',
+                delete obj.RenovationAcceptance;
-        label: (
+                delete obj.EquipmentMaintenance;
-          <WorkOrderShow item={item} title="详情" reload={action?.reload} />
+                delete obj.RenovationInspection;
-        ),
+                delete obj.Emergency;
-      },
+                delete obj.EmergEquipmentMaintenancency;
-      update: {
+                delete obj.SecurityInspection;
-        key: '2',
+                delete obj.Complaint;
-        label: (
+                delete obj.QualityCheck;
-          <WorkOrderUpdate item={item} reload={action?.reload} title={title} />
+                return obj;
-        ),
+              },
-      },
+            }}
-      delete: {
+            reload={action?.reload}
-        key: '3',
+            title={title}
-        label: (
-          <MyButtons.Delete
-            onConfirm={() =>
-              Apis.WorkOrder.HouseWorkOrders.Delete({
-                id: item.id,
-              }).then(() => action?.reload())
-            }
           />
-        ),
+        </>
-      },
+      ),
+      assign: (
+        <>
+          <WorkOrderAssign item={item} reload={action?.reload} title="指派" />
+        </>
+      ),
+      // completed: (
+      //   <>
+      //     {item.status === 'Completed' && item.is_visited === 0 && (
+      //       <WorkOrderShow item={item} title="回访" reload={action?.reload} />
+      //     )}
+      //   </>
+      // ),
+      delete: (
+        <MyButtons.Delete
+          disabled={item.status !== 'Pending'}
+          onConfirm={() =>
+            Apis.WorkOrder.HouseWorkOrders.Delete({
+              id: item.id,
+            }).then(() => action?.reload())
+          }
+        />
+      ),
     });
 
-    let Others = (
+    return [...permissions];
-      <Dropdown menu={{ items: permissionsSpace }} trigger={['click']}>
-        <MyButtons.Default title="更多" />
-      </Dropdown>
-    );
-    return [...permissions, ...[Others]];
   };
 
   return (

src/pages/work_order/list/modals/WorkOrderCreate.tsx

@@ -47,7 +47,11 @@ export default function WorkOrderCreate(props: MyBetaModalFormProps) {
           title: '工单类型',
           colProps: { span: 24 },
           // valueEnum: HouseWorkOrdersTypeEnum,
-          valueEnum: props?.item?.typeEnum,
+          valueEnum: () => {
+            let obj: any = JSON.parse(JSON.stringify(HouseWorkOrdersTypeEnum));
+            delete obj.Complaint;
+            return obj;
+          },
           required: true,
         }),
         {

src/pages/work_order/list/modals/WorkOrderShow.tsx

@@ -39,12 +39,7 @@ export default function WorkOrderShow({
 
   return (
     <>
-      <MyButtons.Default
+      <MyButtons.Default onClick={handleOpen} type={'primary'} title={title} />
-        onClick={handleOpen}
-        disabled={item?.is_visited || item.status !== 'Completed'}
-        type={'primary'}
-        title={title}
-      />
       <Modal
         title={title}
         open={open}

src/pages/work_order/list/modals/WorkOrderUpdate.tsx

@@ -27,7 +27,12 @@ export default function WorkOrderUpdate(
       width="600px"
       layout="horizontal"
       key={new Date().getTime()}
-      trigger={<MyButtons.Edit title={`编辑`} disabled={props.item?.status !== 'Pending'} />}
+      trigger={
+        <MyButtons.Edit
+          title={`编辑`}
+          disabled={props.item?.status !== 'Pending'}
+        />
+      }
       onOpenChange={(open: any) => {
         if (open && props.item) {
           const formValues = {
@@ -61,7 +66,11 @@ export default function WorkOrderUpdate(
           title: '工单类型',
           colProps: { span: 24 },
           // valueEnum: HouseWorkOrdersTypeEnum,
-          valueEnum: props?.item?.typeEnum,
+          valueEnum: () => {
+            let obj: any = JSON.parse(JSON.stringify(HouseWorkOrdersTypeEnum));
+            delete obj.Complaint;
+            return obj;
+          },
           required: true,
         }),
         {