时间格式修正

jinhui.wang
Commit a16807bff164b36db977acb51007fded76a3016e a16807bf 1 parent caab4ad7
Showing 2 changed files with 41 additions and 114 deletions
src/views/basicInformation/flightInformationMaintenance/index.vue
src/views/systemLog/dmLog/index.vue
--- a/src/views/basicInformation/flightInformationMaintenance/index.vue
View file @a16807b
+++ b/src/views/basicInformation/flightInformationMaintenance/index.vue
View file @a16807b
@@ -602,7 +602,7 @@ export default {
   created() {
     //查询条件数据源
     let date = new Date()
-    this.queryParams.fltDateStart = `${date.getFullYear()}-${(date.getMonth() + 1).length > 1 ? (date.getMonth() + 1) : '0' + (date.getMonth() + 1)}-${date.getDate().lenght > 1 ? date.getDate() : '0' + date.getDate()}`
+    this.queryParams.fltDateStart = `${date.getFullYear()}-${(date.getMonth() + 1) > 9 ? (date.getMonth() + 1) : '0' + (date.getMonth() + 1)}-${(date.getDate()) > 9 ? date.getDate() : '0' + (date.getDate())}`
     this.findFltConditionData();
     if (this.$store.state.tagsView.cachedViews.length == 0) {
       this.findAllFltData();
--- a/src/views/systemLog/dmLog/index.vue
View file @a16807b
+++ b/src/views/systemLog/dmLog/index.vue
View file @a16807b
 <template>
   <div>
-    <el-form
+    <el-form ref="dmLogForm" class="form-header" :model="selectForm" label-width="auto" size="small" :rules="rules">
-      ref="dmLogForm"
-      class="form-header"
-      :model="selectForm"
-      label-width="auto"
-      size="small"
-      :rules="rules"
-    >
       <el-row type="flex" style="flex-wrap: wrap !important">
         <el-col :span="6">
           <el-form-item label="ACCS航班号">
-            <el-input
+            <el-input v-model.trim="fltNo" class="formItem" placeholder="请输入航班号" clearable></el-input>
-              v-model.trim="fltNo"
-              class="formItem"
-              placeholder="请输入航班号"
-              clearable
-            ></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="创建日期" prop="createTime">
-            <el-date-picker
+            <el-date-picker v-model="selectForm.createTime" class="formItem" type="date" placeholder="选择日期"
-              v-model="selectForm.createTime"
+              :value-format="valueFormat" :clearable="false">
-              class="formItem"
-              type="date"
-              placeholder="选择日期"
-              :value-format="valueFormat"
-              :clearable="false"
-            >
             </el-date-picker>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="运单号">
-            <el-input
+            <el-input v-model="selectForm.awbNbr" class="formItem" placeholder="请输入运单号" clearable></el-input>
-              v-model="selectForm.awbNbr"
-              class="formItem"
-              placeholder="请输入运单号"
-              clearable
-            ></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="配舱结果">
-            <el-select
+            <el-select v-model="selectForm.status" class="formItem" placeholder="不限" clearable>
-              v-model="selectForm.status"
-              class="formItem"
-              placeholder="不限"
-              clearable
-            >
               <el-option label="0-未处理" value="0"></el-option>
               <el-option label="1-已处理" value="1"></el-option>
               <el-option label="2-无需处理" value="2"></el-option>
@@ -62,47 +34,25 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="航班日期">
-            <el-date-picker
+            <el-date-picker v-model="selectForm.fltDate" class="formItem" type="date" placeholder="选择日期"
-              v-model="selectForm.fltDate"
+              :value-format="valueFormat" clearable>
-              class="formItem"
-              type="date"
-              placeholder="选择日期"
-              :value-format="valueFormat"
-              clearable
-            >
             </el-date-picker>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="口岸代码">
-            <el-select
+            <el-select v-model="selectForm.portName" class="formItem" placeholder="不限" clearable>
-              v-model="selectForm.portName"
+              <el-option v-for="item in portList" :label="item.englishName" :value="item.englishName" :key="item.id">
-              class="formItem"
+              </el-option>
-              placeholder="不限"
-              clearable
-            >
-              <el-option
-                v-for="item in portList"
-                :label="item.englishName"
-                :value="item.englishName"
-                :key="item.id"
-              ></el-option>
             </el-select>
           </el-form-item>
         </el-col>
       </el-row>
       <div style="display: flex">
-        <el-button
+        <el-button type="primary" size="small" icon="el-icon-search" :loading="loading"
-          type="primary"
+          :disabled="!selectForm.createTime" @click="selectDMData(0)">查询</el-button>
-          size="small"
+        <!-- <div class="tags">
-          icon="el-icon-search"
+          <div>状态说明：</div> -->
-          :loading="loading"
-          :disabled="!selectForm.createTime"
-          @click="selectDMData(0)"
-          >查询</el-button
-        >
-        <div class="tags">
-          <div>状态说明：</div>
           <!-- <el-tooltip
             class="tagTip"
             effect="dark"
@@ -119,7 +69,7 @@
           >
             <el-tag size="medium" type="success">已处理</el-tag>
           </el-tooltip> -->
-          <el-tooltip class="tagTip" effect="dark" placement="top">
+          <!-- <el-tooltip class="tagTip" effect="dark" placement="top">
             <div slot="content">
               1.判断配舱类型失败<br />2.数据初始化失败<br />3.配舱失败
             </div>
@@ -132,22 +82,12 @@
             </div>
             <el-tag size="medium" type="warning">无需处理</el-tag>
           </el-tooltip>
-          <el-tooltip
+          <el-tooltip class="tagTip" effect="dark" content="缺少必填得数据或数据超长" placement="top">
-            class="tagTip"
-            effect="dark"
-            content="缺少必填得数据或数据超长"
-            placement="top"
-          >
             <el-tag size="medium" type="warning">校验不通过</el-tag>
           </el-tooltip>
-          <el-tooltip
+          <el-tooltip class="tagTip" effect="dark" content="同一条数据只能处理一次" placement="top">
-            class="tagTip"
-            effect="dark"
-            content="同一条数据只能处理一次"
-            placement="top"
-          >
             <el-tag size="medium" type="warning">数据不能被多次处理</el-tag>
-          </el-tooltip>
+          </el-tooltip> -->
           <!-- <el-tooltip
             class="tagTip"
             effect="dark"
@@ -156,40 +96,26 @@
           >
             <el-tag size="medium">处理中</el-tag>
           </el-tooltip> -->
-        </div>
+        <!-- </div> -->
       </div>
     </el-form>
-    <Tables
+    <Tables ref="dmLogTables" ductName="logDmData" :data="data" :headerData="tableHeader" :infoShow="false"
-      ref="dmLogTables"
+      :height="tableHeight" :page="selectForm.page" :pageSizes="[100]" :totalCount="total" :loading="loading"
-      ductName="logDmData"
+      @currentChange="currentChange" @sortChange="sortChange">
-      :data="data"
-      :headerData="tableHeader"
-      :infoShow="false"
-      :height="tableHeight"
-      :page="selectForm.page"
-      :pageSizes="[100]"
-      :totalCount="total"
-      :loading="loading"
-      @currentChange="currentChange"
-      @sortChange="sortChange"
-    >
       <template v-slot:status="scope">
-        <el-tag
+        <el-tag :type="
-          :type="
+          scope.row.status == 1
-            scope.row.status == 1
+            ? 'success'
-              ? 'success'
+            : scope.row.status == 2
-              : scope.row.status == 2
               ? 'warning'
               : scope.row.status == 3
-              ? 'danger'
+                ? 'danger'
-              : scope.row.status == 4
+                : scope.row.status == 4
-              ? 'warning'
+                  ? 'warning'
-              : scope.row.status == 5
+                  : scope.row.status == 5
-              ? 'warning'
+                    ? 'warning'
-              : ''
+                    : ''
-          "
+        "><span>{{ statusData(scope.row.status) }}</span></el-tag>
-          ><span>{{ statusData(scope.row.status) }}</span></el-tag
-        >
       </template>
     </Tables>
   </div>
@@ -604,11 +530,11 @@ export default {
     //当前日期格式化
     nowDate() {
       let date = new Date();
-      this.selectForm.createTime = `${date.getFullYear()}-${
+      this.selectForm.createTime = `${date.getFullYear()}-${(date.getMonth() + 1) > 9
-        (date.getMonth() + 1).length > 1
+        ? date.getMonth() + 1
-          ? date.getMonth() + 1
+        : "0" + (date.getMonth() + 1)
-          : "0" + (date.getMonth() + 1)
+        }-${date.getDate() > 9 ? date.getDate() : '0' + date.getDate()
-      }-${date.getDate()}`;
+        }`;
     },
     //数据查询
     selectDMData(val) {
@@ -700,6 +626,7 @@ export default {
   color: black;
   line-height: 32px;
 }
+
 .tagTip {
   margin: 0 5px;
 }