时间查询修正

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

@@ -15,7 +15,7 @@
           </router-link>
         </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>

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

@@ -15,7 +15,7 @@
           </router-link>
         </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>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/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>

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

@@ -15,7 +15,7 @@
           </router-link>
         </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>
@@ -458,7 +458,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/supplier/basislist.vue

@@ -26,7 +26,7 @@
         <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"
@@ -171,7 +171,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"

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

@@ -26,7 +26,7 @@
         <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"
@@ -169,7 +169,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"

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

@@ -15,7 +15,7 @@
           <!--</router-link>-->
         <!--</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>

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

@@ -26,7 +26,7 @@
         <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"
@@ -171,7 +171,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"

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

@@ -20,7 +20,7 @@
             </el-button>
           </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>

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

@@ -20,7 +20,7 @@
             </el-button>
           </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>

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

@@ -18,7 +18,7 @@
             </el-button> -->
         <!-- </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>

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

@@ -20,7 +20,7 @@
             </el-button>
           </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>

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

@@ -15,7 +15,7 @@
           </router-link>
         </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/suppliercert/index.vue

@@ -15,7 +15,7 @@
           </router-link>
         </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>
@@ -346,7 +346,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/supplierfile/index.vue

@@ -17,7 +17,7 @@
           </router-link>
         </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>
@@ -222,7 +222,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/_opera/goodsedit.vue

@@ -27,10 +27,10 @@
           <el-button type="primary" size="mini" style="margin-right: 5px" v-if="this,formData.Status == '7'" @click="createWZAccessCardNo">生成准入编码</el-button>
           <el-button type="primary" size="mini" style="margin-right: 5px" v-if="this,formData.Status == '7'" @click="saveAccessCardNo">保存准入编码</el-button>
           <el-button type="primary" size="mini" style="margin-right: 5px" v-if="this,formData.Status == '7'" @click="confirm">确认入库</el-button>
-          <router-link :to="'/oilsupplier/supplierstorage/goodslist'">
-            <el-button type="primary" size="mini" style="margin-left: 8px" v-if="showReturn">返回
+          <!-- <router-link :to="'/oilsupplier/supplierstorage/goodslist'"> -->
+            <el-button type="primary" size="mini" style="margin-left: 8px" v-if="showReturn" @click="$router.back(-1)">返回
             </el-button>
-          </router-link>
+          <!-- </router-link> -->
         </span>
       </div>
 

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

@@ -15,7 +15,7 @@
           </router-link>
         </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>
@@ -160,7 +160,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/system/auditsetting/index_2.vue

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