时间筛选

src/views/components/ListPage/Search.vue

@@ -8,7 +8,7 @@
                 </el-form-item>
 
                 <!-- 时间选择 -->
-                <el-form-item :label="item.label" v-if="item.type === 'date'" :prop="item.prop">
+                <el-form-item :label="item.queryLabel||item.label" v-if="item.type === 'date'" :prop="item.prop">
                     <el-date-picker v-model="formInline[item.prop]" value-format="YYYY-MM-DD" type="daterange"
                         range-separator="-" start-placeholder="开始日期" clearable end-placeholder="结束日期"></el-date-picker>
                 </el-form-item>

src/views/finance/examine/useData.js

@@ -92,20 +92,16 @@ export default ({proxy,jlzj_area_type}) => {
             isSearch: true,
             width:'200px',
         },
-       
-        {
-            label: '申请时间',
-            prop: 'applyTime',
-            width:'160px',
-                isSearch: true,
-                type: 'date',
-                keys: ['applyTimeStart', 'applyTimeEnd'],
-        },
         {
             label: '订单开始时间',
+            queryLabel: '订单时间',
             prop: 'orderTime',
-            width:'160px',
+            width: '160px',
+            isSearch: true,
+            type: 'date',
+            keys: ['startTime', 'endTime'],
         },
+
         {
             label: '订单完成时间',
             prop: 'serviceEndTime',
@@ -231,19 +227,14 @@ export default ({proxy,jlzj_area_type}) => {
             isSearch: true,
             width:'200px',
         },
-       
-        {
-            label: '申请时间',
-            prop: 'applyTime',
-            width:'160px',
-                isSearch: true,
-                type: 'date',
-                keys: ['applyTimeStart', 'applyTimeEnd'],
-        },
         {
             label: '订单开始时间',
+            queryLabel: '订单时间',
             prop: 'orderTime',
-            width:'160px',
+            width: '160px',
+            isSearch: true,
+            type: 'date',
+            keys: ['startTime', 'endTime'],
         },
         {
             label: '订单完成时间',

src/views/finance/settlement/useRegional.js

@@ -118,26 +118,26 @@ export default ({ proxy, jlzj_area_type }) => {
         },
         {
             label: '订单编号',
-            prop: 'outTradeNo',
+            prop: 'orderNo',
             type: 'input',
             isSearch: true,
             width: '200px',
         },
         {
             label: '订单开始时间',
+            queryLabel: '订单时间',
+
             prop: 'orderTime',
             width: '160px',
             isSearch: true,
             type: 'date',
-            keys: ['serviceCompleteStartTime', 'serviceCompleteEndTime'],
+            keys: ['startTime', 'endTime'],
         },
         {
             label: '订单完成时间',
             prop: 'serviceEndTime',
             width: '160px',
             isSearch: false,
-            type: 'date',
-            keys: ['serviceCompleteStartTime', 'serviceCompleteEndTime'],
         },
         {
             label: '用户名称',
@@ -225,26 +225,25 @@ export default ({ proxy, jlzj_area_type }) => {
     const list_quyu = ref([
         {
             label: '订单编号',
-            prop: 'outTradeNo',
+            prop: 'orderNo',
             type: 'input',
             isSearch: true,
             width: '200px',
         },
         {
             label: '订单开始时间',
+            queryLabel: '订单时间',
             prop: 'orderTime',
             width: '160px',
             isSearch: true,
             type: 'date',
-            keys: ['serviceCompleteStartTime', 'serviceCompleteEndTime'],
+            keys: ['startTime', 'endTime'],
         },
         {
             label: '订单完成时间',
             prop: 'serviceEndTime',
             width: '160px',
             isSearch: false,
-            type: 'date',
-            keys: ['serviceCompleteStartTime', 'serviceCompleteEndTime'],
         },
         {
             label: '用户名称',

src/views/finance/settlement/useService.js

@@ -172,19 +172,19 @@ export default ({ proxy, jlzj_area_type }) => {
             },
             {
                 label: '订单开始时间',
+                queryLabel: '订单时间',
+    
                 prop: 'orderTime',
                 width: '160px',
                 isSearch: true,
                 type: 'date',
-                keys: ['orderTimeStart', 'orderTimeEnd'],
+                keys: ['startTime', 'endTime'],
             },
             {
                 label: '订单完成时间',
                 prop: 'serviceEndTime',
                 width: '160px',
-                isSearch: true,
-                type: 'date',
-                keys: ['serviceEndTimeStart', 'serviceEndTimeEnd'],
+                isSearch: false,
             },
             {
                 label: '用户名称',