Merge remote-tracking branch 'origin/dev_7004' into dev_7004

gaoluyang

10 天以前 35e8bd80ff9d33a7ab01777f863a41ce97a2051a

Merge remote-tracking branch 'origin/dev_7004' into dev_7004

 src/views/collaborativeApproval/approvalProcess/index1.vue

@@ -1,5 +1,5 @@
<template>
  <div class="app-container">
  <div class="container">
    <!-- 引入index.vue组件并传递参数 -->
    <ApprovalProcessIndex :approveType="1" />
  </div>
@@ -15,7 +15,7 @@
</script>

<style scoped>
.app-container {
.container {
  width: 100%;
  height: 100%;
}

 src/views/collaborativeApproval/approvalProcess/index2.vue

@@ -1,5 +1,5 @@
<template>
  <div class="app-container">
  <div class="container">
    <!-- 引入index.vue组件并传递参数 -->
    <ApprovalProcessIndex :approveType="2" />
  </div>
@@ -15,7 +15,7 @@
</script>

<style scoped>
.app-container {
.container {
  width: 100%;
  height: 100%;
}

 src/views/collaborativeApproval/approvalProcess/index3.vue

@@ -1,5 +1,5 @@
<template>
  <div class="app-container">
  <div class="container">
    <!-- 引入index.vue组件并传递参数 -->
    <ApprovalProcessIndex :approveType="3" />
  </div>
@@ -15,7 +15,7 @@
</script>

<style scoped>
.app-container {
.container {
  width: 100%;
  height: 100%;
}

 src/views/collaborativeApproval/approvalProcess/index4.vue

@@ -1,5 +1,5 @@
<template>
  <div class="app-container">
  <div class="container">
    <!-- 引入index.vue组件并传递参数 -->
    <ApprovalProcessIndex :approveType="4" />
  </div>
@@ -15,7 +15,7 @@
</script>

<style scoped>
.app-container {
.container {
  width: 100%;
  height: 100%;
}

 src/views/equipmentManagement/ledger/index.vue

@@ -127,7 +127,12 @@
} = usePaginationApi(
  getLedgerPage,
  {
    searchText: undefined,
    deviceName: undefined,
    deviceModel: undefined,
    supplierName: undefined,
    unit: undefined,
    entryDateStart: undefined,
    entryDateEnd: undefined,
  },
  [
    {

 src/views/equipmentManagement/repair/index.vue

@@ -163,7 +163,12 @@
} = usePaginationApi(
  getRepairPage,
  {
    searchText: undefined,
    deviceName: undefined,
    deviceModel: undefined,
    remark: undefined,
    maintenanceName: undefined,
    repairTimeStr: undefined,
    maintenanceTimeStr: undefined,
  },
  [
    {

 src/views/equipmentManagement/upkeep/index.vue

@@ -154,7 +154,12 @@
  getTableData,
  resetFilters,
  onCurrentChange,
} = usePaginationApi(getUpkeepPage, {}, [
} = usePaginationApi(getUpkeepPage, {
  deviceName: undefined,
  maintenancePlanTime: undefined,
  maintenanceActuallyTime: undefined,
  maintenanceActuallyName: undefined,
}, [
  {
    label: "设备名称",
    align: "center",

 src/views/financialManagement/expenseManagement/index.vue

@@ -1,7 +1,7 @@
<template>
  <div class="app-container">
    <el-form :model="filters" :inline="true">
      <el-form-item label="录入日期:">
      <el-form-item label="支出日期:">
        <el-date-picker v-model="filters.entryDate" value-format="YYYY-MM-DD" format="YYYY-MM-DD" type="daterange"
                        placeholder="请选择" clearable @change="changeDaterange" />
      </el-form-item>

 src/views/financialManagement/revenueManagement/index.vue

@@ -1,7 +1,7 @@
<template>
  <div class="app-container">
    <el-form :model="filters" :inline="true">
      <el-form-item label="录入日期:">
      <el-form-item label="收入日期:">
        <el-date-picker v-model="filters.entryDate" value-format="YYYY-MM-DD" format="YYYY-MM-DD" type="daterange"
                        placeholder="请选择" clearable @change="changeDaterange" />
      </el-form-item>