浏览代码

时间格式修改为24小时

JXDS18FUJT 2 年之前
父节点
当前提交
8769c21850

+ 2 - 1
src/views/driver/coopschool/index.vue

@@ -88,7 +88,8 @@
             <el-table-column label="是否开通" align="center" prop="schoolCommission">
                 <template slot-scope="scope">
                     <span v-if="scope.row.isOpen == 1">开</span>
-                    <span style="color: red;" v-else>关</span>
+                    <span v-else-if="scope.row.isOpen == 0" style="color: red;" >关</span>
+                    <span v-else-if="scope.row.isOpen == 2" style="color: red;" >部分</span>
 
                 </template>
             </el-table-column>

+ 3 - 3
src/views/driver/report/index.vue

@@ -8,13 +8,13 @@
                 </el-select>
             </el-form-item> -->
             <el-form-item label="开始时间" label-width="120px" prop="outTradeNo">
-                <el-date-picker value-format="yyyy-MM-dd hh:mm:ss" v-model="queryParams.startTime" type="datetime" placeholder="默认是当前月份第一天"
+                <el-date-picker format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" v-model="queryParams.startTime" type="datetime" placeholder="默认是当前月份第一天"
                    >
                 </el-date-picker>
 
             </el-form-item>
             <el-form-item label="结束时间" label-width="120px" prop="outTradeNo">
-                <el-date-picker value-format="yyyy-MM-dd hh:mm:ss" v-model="queryParams.endTime" type="datetime" placeholder="默认是当前月份最后一天"
+                <el-date-picker format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" v-model="queryParams.endTime" type="datetime" placeholder="默认是当前月份最后一天"
                    >
                 </el-date-picker>
 
@@ -163,7 +163,7 @@ let date = new Date()
 let defaultStartTime = `${date.getFullYear()}-${date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1}-01 00:00:00`
 let defaultEndTime = `${date.getFullYear()}-${date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1}-${new Date(date.getFullYear(), date.getMonth() + 1, 0).getDate()} 23:59:59`;
 export default {
-    name: "Error",
+    name: "report",
     data() {
         return {
             defaultStartTime: defaultStartTime,

+ 2 - 2
src/views/driver/reportDetail/index.vue

@@ -8,13 +8,13 @@
                 </el-select>
             </el-form-item> -->
             <el-form-item label="开始时间" label-width="120px" prop="outTradeNo">
-                <el-date-picker value-format="yyyy-MM-dd hh:mm:ss" v-model="queryParams.startTime" type="datetime" placeholder="默认是当前月份第一天"
+                <el-date-picker format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" v-model="queryParams.startTime" type="datetime" placeholder="默认是当前月份第一天"
                    >
                 </el-date-picker>
 
             </el-form-item>
             <el-form-item label="结束时间" label-width="120px" prop="outTradeNo">
-                <el-date-picker value-format="yyyy-MM-dd hh:mm:ss" v-model="queryParams.endTime" type="datetime" placeholder="默认是当前月份最后一天"
+                <el-date-picker format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" v-model="queryParams.endTime" type="datetime" placeholder="默认是当前月份最后一天"
                    >
                 </el-date-picker>