diff --git a/src/api/hard/hard-car.ts b/src/api/hard/hard-car.ts
new file mode 100644
index 0000000..89f38f5
--- /dev/null
+++ b/src/api/hard/hard-car.ts
@@ -0,0 +1,49 @@
+import request from "/@/utils/request"
+
+export function pageJoin(query?: Object) {
+  return request({
+    url: '/hard/hard-car/page-join',
+    method: 'get',
+    params: query
+  })
+}
+
+export function fetchList(query?: Object) {
+  return request({
+    url: '/hard/hard-car/page',
+    method: 'get',
+    params: query
+  })
+}
+
+export function addObj(obj?: Object) {
+  return request({
+    url: '/hard/hard-car',
+    method: 'post',
+    data: obj
+  })
+}
+
+export function getObj(id?: string) {
+  return request({
+    url: '/hard/hard-car/' + id,
+    method: 'get'
+  })
+}
+
+export function delObjs(ids?: Object) {
+  return request({
+    url: '/hard/hard-car',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function putObj(obj?: Object) {
+  return request({
+    url: '/hard/hard-car',
+    method: 'put',
+    data: obj
+  })
+}
+
diff --git a/src/api/hard/hard-order.ts b/src/api/hard/hard-order.ts
new file mode 100644
index 0000000..71e3eac
--- /dev/null
+++ b/src/api/hard/hard-order.ts
@@ -0,0 +1,49 @@
+import request from "/@/utils/request"
+
+export function pageJoin(query?: Object) {
+  return request({
+    url: '/hard/hardware-order/page-join',
+    method: 'get',
+    params: query
+  })
+}
+
+export function fetchList(query?: Object) {
+  return request({
+    url: '/hard/hardware-order/page',
+    method: 'get',
+    params: query
+  })
+}
+
+export function addObj(obj?: Object) {
+  return request({
+    url: '/hard/hardware-order',
+    method: 'post',
+    data: obj
+  })
+}
+
+export function getObj(id?: string) {
+  return request({
+    url: '/hard/hardware-order/' + id,
+    method: 'get'
+  })
+}
+
+export function delObjs(ids?: Object) {
+  return request({
+    url: '/hard/hardware-order',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function putObj(obj?: Object) {
+  return request({
+    url: '/hard/hardware-order',
+    method: 'put',
+    data: obj
+  })
+}
+
diff --git a/src/views/hard/hard-invoice/index.vue b/src/views/hard/hard-invoice/index.vue
index 6ecc4d5..5abc09b 100644
--- a/src/views/hard/hard-invoice/index.vue
+++ b/src/views/hard/hard-invoice/index.vue
@@ -1,31 +1,50 @@
 <template>
   <div class="layout-padding">
     <div class="layout-padding-auto layout-padding-view">
-      <el-row>
-        <div class="mb8" style="width: 100%">
-          <el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()"
-            v-auth="'hard_hardInvoice_add'">
-            新 增
-          </el-button>
-          <el-button plain :disabled="multiple" icon="Delete" type="primary" v-auth="'hard_hardInvoice_del'"
-            @click="handleDelete(selectObjs)">
-            删除
-          </el-button>
-          <right-toolbar v-model:showSearch="showSearch" :export="'hard_hardInvoice_export'" @exportExcel="exportExcel"
-            class="ml10 mr20" style="float: right;" @queryTable="getDataList"></right-toolbar>
-        </div>
-      </el-row>
+      <el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
+        <el-row :gutter="24">
+          <el-col :span="4">
+            <el-form-item class="w100" label="设备名" prop="name">
+              <el-input v-model="state.queryForm.name" placeholder="设备名" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item class="w100" label="设备类型" prop="type">
+              <dict-select v-model="state.queryForm.type" dict-code="hard_type" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item class="w100" label="商户" prop="merchantIds">
+              <select-mch v-model="state.queryForm.merchantIds" />
+            </el-form-item>
+          </el-col>
+          <el-form-item>
+            <el-button icon="Search" type="primary" @click="getDataList">{{ $t('common.queryBtn')
+              }}</el-button>
+            <el-button icon="Refresh" @click="resetQuery">{{ $t('common.resetBtn') }}</el-button>
+          </el-form-item>
+        </el-row>
+      </el-form>
       <el-table :data="state.dataList" v-loading="state.loading" border :cell-style="tableStyle.cellStyle"
         :header-cell-style="tableStyle.headerCellStyle" @selection-change="selectionChangHandle"
         @sort-change="sortChangeHandle">
         <el-table-column type="selection" width="40" align="center" />
         <el-table-column type="index" label="#" width="40" />
-        <el-table-column prop="deptId" label="部门id" show-overflow-tooltip />
-        <el-table-column prop="hardId" label="设备id" show-overflow-tooltip />
-        <el-table-column prop="hardOrderId" label="硬件订单id" show-overflow-tooltip />
-        <el-table-column prop="status" label="状态" show-overflow-tooltip />
-        <el-table-column prop="pic" label="发票图片" show-overflow-tooltip />
-        <el-table-column label="操作" width="150">
+        <el-table-column prop="deptId" label="订单编号" />
+        <el-table-column prop="hardId" label="设备" />
+        <el-table-column label="商家" prop="merchantStr" />
+        <el-table-column label="部门" prop="deptName" />
+        <el-table-column prop="status" label="打印状态">
+          <template #default="{ row }">
+
+          </template>
+        </el-table-column>
+        <el-table-column prop="pic" label="发票">
+          <template #default="{ row }">
+            <preview-image v-if="row.pic" :src="row.pic" />
+          </template>
+        </el-table-column>
+        <el-table-column v-if="false" label="操作" width="150">
           <template #default="scope">
             <el-button icon="edit-pen" text type="primary" v-auth="'hard_hardInvoice_edit'"
               @click="formDialogRef.openDialog(scope.row.id)">编辑</el-button>
@@ -45,7 +64,7 @@
 
 <script setup lang="ts" name="systemHardInvoice">
 import { BasicTableProps, useTable } from "/@/hooks/table";
-import { fetchList, delObjs } from '/@/api/hard/hard-invoice'
+import * as hardInvoiceApi from '/@/api/hard/hard-invoice'
 import { useMessage, useMessageBox } from "/@/hooks/message";
 import { useDict } from '/@/hooks/dict';
 
@@ -64,7 +83,7 @@ const multiple = ref(true)
 
 const state: BasicTableProps = reactive<BasicTableProps>({
   queryForm: {},
-  pageList: fetchList
+  pageList: hardInvoiceApi.pageJoin
 })
 
 //  table hook
@@ -106,7 +125,7 @@ const handleDelete = async (ids: string[]) => {
   }
 
   try {
-    await delObjs(ids);
+    await hardInvoiceApi.delObjs(ids);
     getDataList();
     useMessage().success('删除成功');
   } catch (err: any) {
diff --git a/src/views/hard/hard-order/form.vue b/src/views/hard/hard-order/form.vue
new file mode 100644
index 0000000..a02e4e5
--- /dev/null
+++ b/src/views/hard/hard-order/form.vue
@@ -0,0 +1,120 @@
+<template>
+  <el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible" :close-on-click-modal="false" draggable>
+    <el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
+      <el-row :gutter="24">
+        <el-col :span="12" class="mb20">
+          <el-form-item label="用户id" prop="userId">
+            <el-input v-model="form.userId" placeholder="请输入用户id" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="visible = false">取消</el-button>
+        <el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup lang="ts" name="HardwareOrderDialog">
+import { useDict } from '/@/hooks/dict';
+import { useMessage } from "/@/hooks/message";
+import * as hardOrder from "/@/api/hard/hard-order";
+import * as hardCar from "/@/api/hard/hard-car";
+import { rule } from '/@/utils/validate';
+const emit = defineEmits(['refresh']);
+
+// 定义变量内容
+const dataFormRef = ref();
+const visible = ref(false)
+const loading = ref(false)
+// 定义字典
+
+// 提交表单数据
+const form = reactive({
+  id: '',
+  userId: '',
+  merchantId: '',
+  hardId: '',
+  deptId: '',
+  walletId: '',
+  parentCarId: '',
+  orderSourceTypeId: '',
+  orderType: '',
+  orderStatus: '',
+  payType: '',
+  hourType: '',
+  sysType: '',
+  totalPrice: '',
+  extraPrice: '',
+  payPrice: '',
+  payTime: '',
+  payRefundId: '',
+  refundPrice: '',
+  refundTime: '',
+  refundStatus: '',
+  applyCancelTime: '',
+  androidOrderCode: '',
+  isOfflineOrder: '',
+  productDesc: '',
+  offlinePaySuccess: '',
+});
+
+// 定义校验规则
+const dataRules = ref({
+})
+
+// 打开弹窗
+const openDialog = (id: string) => {
+  visible.value = true
+  form.id = ''
+
+  // 重置表单数据
+  nextTick(() => {
+    dataFormRef.value?.resetFields();
+  });
+
+  // 获取hardwareOrder信息
+  if (id) {
+    form.id = id
+    gethardwareOrderData(id)
+  }
+};
+
+// 提交
+const onSubmit = async () => {
+  const valid = await dataFormRef.value.validate().catch(() => { });
+  if (!valid) return false;
+
+  try {
+    loading.value = true;
+    form.id ? await hardOrder.putObj(form) : await hardOrder.addObj(form);
+    useMessage().success(form.id ? '修改成功' : '添加成功');
+    visible.value = false;
+    emit('refresh');
+  } catch (err: any) {
+    useMessage().error(err.msg);
+  } finally {
+    loading.value = false;
+  }
+};
+
+
+// 初始化表单数据
+const gethardwareOrderData = (id: string) => {
+  // 获取数据
+  loading.value = true
+  hardOrder.getObj(id).then((res: any) => {
+    Object.assign(form, res.data)
+  }).finally(() => {
+    loading.value = false
+  })
+};
+
+// 暴露变量
+defineExpose({
+  openDialog
+});
+</script>
\ No newline at end of file
diff --git a/src/views/hard/hard-order/index.vue b/src/views/hard/hard-order/index.vue
new file mode 100644
index 0000000..e94d321
--- /dev/null
+++ b/src/views/hard/hard-order/index.vue
@@ -0,0 +1,116 @@
+<template>
+  <div class="layout-padding">
+    <div class="layout-padding-auto layout-padding-view">
+      <el-row>
+        <div class="mb8" style="width: 100%">
+          <el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()"
+            v-auth="'hard_hardwareOrder_add'">
+            新 增
+          </el-button>
+          <el-button plain :disabled="multiple" icon="Delete" type="primary" v-auth="'hard_hardwareOrder_del'"
+            @click="handleDelete(selectObjs)">
+            删除
+          </el-button>
+          <right-toolbar v-model:showSearch="showSearch" :export="'hard_hardwareOrder_export'"
+            @exportExcel="exportExcel" class="ml10 mr20" style="float: right;"
+            @queryTable="getDataList"></right-toolbar>
+        </div>
+      </el-row>
+      <el-table :data="state.dataList" v-loading="state.loading" border :cell-style="tableStyle.cellStyle"
+        :header-cell-style="tableStyle.headerCellStyle" @selection-change="selectionChangHandle"
+        @sort-change="sortChangeHandle">
+        <el-table-column type="selection" width="40" align="center" />
+        <el-table-column type="index" label="#" width="40" />
+        <el-table-column prop="userId" label="用户id" show-overflow-tooltip />
+        <el-table-column prop="merchantId" label="商户id" show-overflow-tooltip />
+        <el-table-column prop="hardId" label="设备id" show-overflow-tooltip />
+        <el-table-column label="操作" width="150">
+          <template #default="scope">
+            <el-button icon="edit-pen" text type="primary" v-auth="'hard_hardwareOrder_edit'"
+              @click="formDialogRef.openDialog(scope.row.id)">编辑</el-button>
+            <el-button icon="delete" text type="primary" v-auth="'hard_hardwareOrder_del'"
+              @click="handleDelete([scope.row.id])">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+    </div>
+
+    <!-- 编辑、新增  -->
+    <form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
+
+  </div>
+</template>
+
+<script setup lang="ts" name="systemHardwareOrder">
+import { BasicTableProps, useTable } from "/@/hooks/table";
+import * as hardOrder from "/@/api/hard/hard-order";
+import * as hardCar from "/@/api/hard/hard-car";
+import { useMessage, useMessageBox } from "/@/hooks/message";
+import { useDict } from '/@/hooks/dict';
+
+// 引入组件
+const FormDialog = defineAsyncComponent(() => import('./form.vue'));
+// 定义查询字典
+
+// 定义变量内容
+const formDialogRef = ref()
+// 搜索变量
+const queryRef = ref()
+const showSearch = ref(true)
+// 多选变量
+const selectObjs = ref([]) as any
+const multiple = ref(true)
+
+const state: BasicTableProps = reactive<BasicTableProps>({
+  queryForm: {},
+  pageList: hardOrder.pageJoin
+})
+
+//  table hook
+const {
+  getDataList,
+  currentChangeHandle,
+  sizeChangeHandle,
+  sortChangeHandle,
+  downBlobFile,
+  tableStyle
+} = useTable(state)
+
+// 清空搜索条件
+const resetQuery = () => {
+  // 清空搜索条件
+  queryRef.value?.resetFields()
+  // 清空多选
+  selectObjs.value = []
+  getDataList()
+}
+
+// 导出excel
+const exportExcel = () => {
+  downBlobFile('/hard/hardwareOrder/export', Object.assign(state.queryForm, { ids: selectObjs }), 'hardwareOrder.xlsx')
+}
+
+// 多选事件
+const selectionChangHandle = (objs: { id: string }[]) => {
+  selectObjs.value = objs.map(({ id }) => id);
+  multiple.value = !objs.length;
+};
+
+// 删除操作
+const handleDelete = async (ids: string[]) => {
+  try {
+    await useMessageBox().confirm('此操作将永久删除');
+  } catch {
+    return;
+  }
+
+  try {
+    await hardOrder.delObjs(ids);
+    getDataList();
+    useMessage().success('删除成功');
+  } catch (err: any) {
+    useMessage().error(err.msg);
+  }
+};
+</script>
\ No newline at end of file