jiawuxian 2 anni fa
parent
commit
e5049df5aa

+ 3 - 1
src/views/question/list/index.vue

@@ -64,7 +64,9 @@
               v-model="queryParams.submitRange"
               key="daterange"
               type="daterange"
-              placeholder="请选择发现时间"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
             >
             </DataRangePicker>
           </el-form-item>

+ 3 - 1
src/views/question/reform/index.vue

@@ -48,7 +48,9 @@
               v-model="queryParams.reformRange"
               key="daterange"
               type="daterange"
-              placeholder="请选择整改期限"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
             >
             </DataRangePicker>
           </el-form-item>

+ 15 - 9
src/views/resumption/protection/dialog.history.vue

@@ -22,17 +22,16 @@
           </div>
           <div style="margin-bottom: 20px">
             <span>上报时间范围:</span>
-            <el-date-picker
+            <DataRangePicker
               v-model="queryParams.updateTime"
-              :default-time="defaultTime"
-              type="datetimerange"
-              range-separator="至"
+              key="daterange"
+              type="daterange"
               clearable
+              range-separator="至"
               start-placeholder="开始日期"
               end-placeholder="结束日期"
-              @change="refresh"
             >
-            </el-date-picker>
+            </DataRangePicker>
           </div>
           <el-table :data="tableData" border style="width: 100%">
             <el-table-column type="index" label="序号"></el-table-column>
@@ -71,6 +70,7 @@
 <script>
 import * as api from "@/api/resumption/protection";
 import { getLabel } from "./../../commonOption";
+import DataRangePicker from "@/components/dateTime/daterange.picker.vue";
 export default {
   data() {
     const params = this.$route.params;
@@ -79,7 +79,6 @@ export default {
       isShow: false,
       protection: {},
       tableData: [],
-      defaultTime: ["00:00:00", "23:59:59"],
       queryParams: this.resetSearch(),
       total: 1,
     };
@@ -89,7 +88,14 @@ export default {
       type: Array,
     },
   },
-  watch: {},
+  watch: {
+    "queryParams.updateTime":{
+      deep:true,
+      handler(v){
+        this.refresh();
+      }
+    }
+  },
   computed: {},
   methods: {
     getLabel,
@@ -136,7 +142,7 @@ export default {
   },
   created() {},
   mounted() {},
-  components: {
+  components: {DataRangePicker
     // EditAttribute,
   },
 };

+ 6 - 5
src/views/resumption/protection/index.vue

@@ -46,15 +46,15 @@
           </el-form-item>
 
           <el-form-item prop="dateRange" label="布撤防登记时间">
-            <el-date-picker
+            <DataRangePicker
               v-model="queryParams.dateRange"
-              type="datetimerange"
-              format="yyyy-MM-dd HH:mm"
+              key="daterange"
+              type="daterange"
               range-separator="至"
               start-placeholder="开始日期"
               end-placeholder="结束日期"
             >
-            </el-date-picker>
+            </DataRangePicker>
           </el-form-item>
         </el-form>
 
@@ -246,7 +246,7 @@ import * as api from "@/api/resumption/protection";
 import { getLabel } from "./../../commonOption";
 import { mapGetters } from "vuex";
 import dayjs from "dayjs"
-
+import DataRangePicker from "@/components/dateTime/daterange.picker.vue";
 export default {
   name: "protection",
   dicts: ["protection_status"],
@@ -254,6 +254,7 @@ export default {
     DialogEdit,
     OrgTree,
     DialogHistory,
+    DataRangePicker
   },
   data() {
     const { params, query } = this.$route;

+ 1 - 1
src/views/resumption/rule/dialog.edit.vue

@@ -69,7 +69,7 @@
       </div>
 
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="isShow = false">取消</el-button>
+        <el-button @click="isShow = false">取消</el-button>
         <el-button type="primary" @click="onSubmit">确定</el-button>
       </div>
     </DialogCom>

+ 1 - 1
src/views/resumption/ruleManager/dialog.editItem.vue

@@ -70,7 +70,7 @@
       </div>
 
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary"  @click="dialogVisible = false">取 消</el-button>
+        <el-button  @click="dialogVisible = false">取 消</el-button>
         <el-button type="primary" @click="onSubmit()">保 存</el-button>
       </div>
     </DialogCom>

+ 3 - 0
src/views/resumption/taskManager/index.vue

@@ -71,6 +71,9 @@
               key="daterange"
               type="daterange"
               :clearable="timeClearable"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
             />
           </el-form-item>
         </el-form>