时间标签修改

src/dashoo.cn/frontend_web/src/pages/oilsupplier/paymentselect/index.vue

@@ -154,7 +154,7 @@
           Prop: ''
         },
         // 查询时间
-        CreateOn: [new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()],
+        CreateOn: [],
         // 查询项
         searchFormReset: {},
         searchForm: {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/suppliernopass/basislist.vue

@@ -10,7 +10,7 @@
           <i class="icon icon-table2"></i> 基建类未通过列表
         </span>
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
-          <el-form-item label="上报时间">
+          <el-form-item label="时间">
             <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
           </el-form-item>
@@ -68,7 +68,7 @@
         <el-row>
 
           <el-col :span="12">
-            <el-form-item label="上报时间">
+            <el-form-item label="时间">
               <el-date-picker size="mini" v-model="CreateOn" type="daterange" style="width:100%" range-separator="至"
                               start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
@@ -316,7 +316,7 @@
           Prop: ''
         },
         //查询时间
-        CreateOn: [new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()],
+        CreateOn: [],
         //查询项
         searchFormReset: {},
         searchForm: {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/suppliernopass/goodslist.vue

@@ -10,7 +10,7 @@
           <i class="icon icon-table2"></i> 物资类未通过列表
         </span>
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
-          <el-form-item label="上报时间">
+          <el-form-item label="时间">
             <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
           </el-form-item>
@@ -69,7 +69,7 @@
         <el-row>
 
           <el-col :span="12">
-            <el-form-item label="上报时间">
+            <el-form-item label="时间">
               <el-date-picker size="mini" v-model="CreateOn" type="daterange" style="width:100%" range-separator="至"
                               start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
@@ -316,7 +316,7 @@
           Prop: ''
         },
         // 查询时间
-        CreateOn: [new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()],
+        CreateOn: [],
         // 查询项
         searchFormReset: {},
        searchForm: {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/suppliernopass/index.vue

@@ -11,7 +11,7 @@
         </span>
 
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
-          <el-form-item label="上报时间">
+          <el-form-item label="时间">
             <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
           </el-form-item>
@@ -468,7 +468,7 @@
           Prop: ''
         },
         // 查询时间
-        CreateOn: [new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()],
+        CreateOn: [],
         // 查询项
         searchFormReset: {},
         searchForm: {
@@ -864,7 +864,7 @@
         }
         let myCreateOn = []
         // 解析时间
-        if (this.CreateOn.length == 2) {
+        if (this.CreateOn!=null && this.CreateOn.length == 2) {
           this.CreateOn[1].setHours(23)
           this.CreateOn[1].setMinutes(59)
           this.CreateOn[1].setSeconds(59)

src/dashoo.cn/frontend_web/src/pages/oilsupplier/suppliernopass/techlist.vue

@@ -10,7 +10,7 @@
           <i class="icon icon-table2"></i> 技术服务类未通过列表
         </span>
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
-          <el-form-item label="上报时间">
+          <el-form-item label="时间">
             <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
           </el-form-item>
@@ -68,7 +68,7 @@
         <el-row>
 
           <el-col :span="12">
-            <el-form-item label="上报时间">
+            <el-form-item label="时间">
               <el-date-picker size="mini" v-model="CreateOn" type="daterange" style="width:100%" range-separator="至"
                               start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
@@ -317,7 +317,7 @@
           Prop: ''
         },
         //查询时间
-        CreateOn: [new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()],
+        CreateOn: [],
         //查询项
         searchFormReset: {},
         CompanyApprovedData: {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierps/basislist.vue

@@ -11,7 +11,7 @@
         </span>
 
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
-          <el-form-item label="上报时间">
+          <el-form-item label="时间">
             <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
           </el-form-item>
@@ -79,7 +79,7 @@
         <el-row>
 
           <el-col :span="12">
-            <el-form-item label="生成时间">
+            <el-form-item label="时间">
               <el-date-picker size="mini" v-model="CreateOn" type="daterange" style="width:100%" range-separator="至"
                               start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
@@ -326,7 +326,7 @@
           Prop: ''
         },
         //查询时间
-        CreateOn: [new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()],
+        CreateOn: [],
         //查询项
         searchFormReset: {},
          searchForm: {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierps/goodslist.vue

@@ -11,7 +11,7 @@
         </span>
 
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
-          <el-form-item label="上报时间">
+          <el-form-item label="时间">
             <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
           </el-form-item>
@@ -77,7 +77,7 @@
         <el-row>
 
           <el-col :span="12">
-            <el-form-item label="上报时间">
+            <el-form-item label="时间">
               <el-date-picker size="mini" v-model="CreateOn" type="daterange" style="width:100%" range-separator="至"
                               start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
@@ -325,7 +325,7 @@
           Prop: ''
         },
         //查询时间
-        CreateOn: [new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()],
+        CreateOn: [],
         //查询项
         searchFormReset: {},
          searchForm: {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierps/index.vue

@@ -11,7 +11,7 @@
         </span>
 
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
-          <el-form-item label="上报时间">
+          <el-form-item label="时间">
             <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
           </el-form-item>
@@ -478,7 +478,7 @@
           Prop: ''
         },
         // 查询时间
-        CreateOn: [new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()],
+        CreateOn: [],
         // 查询项
         searchFormReset: {},
         searchForm: {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierps/techlist.vue

@@ -11,7 +11,7 @@
         </span>
 
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
-          <el-form-item label="上报时间">
+          <el-form-item label="时间">
             <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
           </el-form-item>
@@ -80,7 +80,7 @@
         <el-row>
 
           <el-col :span="12">
-            <el-form-item label="上报时间">
+            <el-form-item label="时间">
               <el-date-picker size="mini" v-model="CreateOn" type="daterange" style="width:100%" range-separator="至"
                               start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
@@ -328,7 +328,7 @@
           Prop: ''
         },
         //查询时间
-        CreateOn: [new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()],
+        CreateOn: [],
         //查询项
         searchFormReset: {},
         CompanyApprovedData: {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstorage/basislist.vue

@@ -10,7 +10,7 @@
           <i class="icon icon-table2"></i> 基建类待入库列表
         </span>
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
-          <el-form-item label="上报时间">
+          <el-form-item label="时间">
             <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
           </el-form-item>
@@ -68,7 +68,7 @@
         <el-row>
 
           <el-col :span="12">
-            <el-form-item label="上报时间">
+            <el-form-item label="时间">
               <el-date-picker size="mini" v-model="CreateOn" type="daterange" style="width:100%" range-separator="至"
                               start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
@@ -316,7 +316,7 @@
           Prop: ''
         },
         //查询时间
-        CreateOn: [new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()],
+        CreateOn: [],
         //查询项
         searchFormReset: {},
          searchForm: {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstorage/goodslist.vue

@@ -10,7 +10,7 @@
           <i class="icon icon-table2"></i> 物资类待入库列表
         </span>
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
-          <el-form-item label="上报时间">
+          <el-form-item label="时间">
             <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
           </el-form-item>
@@ -68,7 +68,7 @@
         <el-row>
 
           <el-col :span="12">
-            <el-form-item label="上报时间">
+            <el-form-item label="时间">
               <el-date-picker size="mini" v-model="CreateOn" type="daterange" style="width:100%" range-separator="至"
                               start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
@@ -315,7 +315,7 @@
           Prop: ''
         },
         // 查询时间
-        CreateOn: [new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()],
+        CreateOn: [],
         // 查询项
         searchFormReset: {},
         searchForm: {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstorage/index.vue

@@ -11,7 +11,7 @@
         </span>
 
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
-          <el-form-item label="上报时间">
+          <el-form-item label="时间">
             <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
           </el-form-item>
@@ -468,7 +468,7 @@
           Prop: ''
         },
         // 查询时间
-        CreateOn: [new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()],
+        CreateOn: [],
         // 查询项
         searchFormReset: {},
         searchForm: {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstorage/techlist.vue

@@ -10,7 +10,7 @@
           <i class="icon icon-table2"></i> 技术服务类待入库列表
         </span>
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
-          <el-form-item label="上报时间">
+          <el-form-item label="时间">
             <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
           </el-form-item>
@@ -68,7 +68,7 @@
         <el-row>
 
           <el-col :span="12">
-            <el-form-item label="上报时间">
+            <el-form-item label="时间">
               <el-date-picker size="mini" v-model="CreateOn" type="daterange" style="width:100%" range-separator="至"
                               start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
@@ -317,7 +317,7 @@
           Prop: ''
         },
         //查询时间
-        CreateOn: [new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()],
+        CreateOn: [],
         //查询项
         searchFormReset: {},
         CompanyApprovedData: {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstore/basislist.vue

@@ -10,7 +10,7 @@
           <i class="icon icon-table2"></i> 基建类已入库列表
         </span>
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
-          <el-form-item label="上报时间">
+          <el-form-item label="时间">
             <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
           </el-form-item>
@@ -74,7 +74,7 @@
         <el-row>
 
           <el-col :span="12">
-            <el-form-item label="上报时间">
+            <el-form-item label="时间">
               <el-date-picker size="mini" v-model="CreateOn" type="daterange" style="width:100%" range-separator="至"
                               start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
@@ -322,7 +322,7 @@ import certApi from '@/api/oilsupplier/suppliercert'
           Prop: ''
         },
         // 查询时间
-        CreateOn: [new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()],
+        CreateOn: [],
         // 查询项
         searchFormReset: {},
         searchForm: {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstore/goodslist.vue

@@ -10,7 +10,7 @@
           <i class="icon icon-table2"></i> 物资类已入库列表
         </span>
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
-          <el-form-item label="上报时间">
+          <el-form-item label="时间">
             <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
           </el-form-item>
@@ -74,7 +74,7 @@
         <el-row>
 
           <el-col :span="12">
-            <el-form-item label="上报时间">
+            <el-form-item label="时间">
               <el-date-picker size="mini" v-model="CreateOn" type="daterange" style="width:100%" range-separator="至"
                               start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
@@ -321,7 +321,7 @@
           Prop: ''
         },
         // 查询时间
-        CreateOn: [new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()],
+        CreateOn: [],
         // 查询项
         searchFormReset: {},
         searchForm: {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstore/index.vue

@@ -11,7 +11,7 @@
         </span>
 
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
-          <el-form-item label="上报时间">
+          <el-form-item label="时间">
             <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
           </el-form-item>
@@ -112,7 +112,7 @@
           Prop: ''
         },
         // 查询时间
-        CreateOn: [new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()],
+        CreateOn: [],
         // 查询项
         searchFormReset: {},
         searchForm: {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstore/techlist.vue

@@ -10,7 +10,7 @@
           <i class="icon icon-table2"></i> 技术服务类已入库列表
         </span>
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
-          <el-form-item label="上报时间">
+          <el-form-item label="时间">
             <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
           </el-form-item>
@@ -74,7 +74,7 @@
         <el-row>
 
           <el-col :span="12">
-            <el-form-item label="上报时间">
+            <el-form-item label="时间">
               <el-date-picker size="mini" v-model="CreateOn" type="daterange" style="width:100%" range-separator="至"
                               start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
@@ -323,7 +323,7 @@
           Prop: ''
         },
         //查询时间
-        CreateOn: [new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()],
+        CreateOn: [],
         //查询项
         searchFormReset: {},
         CompanyApprovedData: {

src/dashoo.cn/frontend_web/src/pages/select/badrecordselect/index.vue

@@ -946,7 +946,7 @@ export default {
       tcTemp: '',
       yChooseCert: '',
       activeName: 'first',
-      CreateOn: [new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()],
+      CreateOn: [],
       goodsSelection: [],
       basisSelection: [],
       tcSelection: [],

src/dashoo.cn/frontend_web/src/pages/select/informationreporting/index.vue

@@ -101,7 +101,7 @@ export default {
     return {
       // 定义列表数据
       entityList: [],
-      CreateOn: [new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()],
+      CreateOn: [],
       // 分页参数
       size: 10,
       currentPage: 1,

src/dashoo.cn/frontend_web/src/pages/select/usednameselect/index.vue

@@ -15,7 +15,7 @@
 
         <el-form :model="searchForm" ref="searchformRef" :inline="true"
           style="float: right;position:absolute;right:15px;top:10.5px">
-          <el-form-item label="申请时间">
+          <el-form-item label="时间">
             <el-date-picker size="mini"
                             style="width: 220px"
                             v-model="CreateOn"
@@ -71,7 +71,7 @@
       return {
         // 定义列表数据
         entityList: [],
-        CreateOn: [new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()],
+        CreateOn: [],
         // 分页参数
         size: 10,
         currentPage: 1,