zc

src/views/comprehensive/laboratoryManagement/accessAuthorization/application.vue

@@ -116,7 +116,7 @@
         total:10,
         tableList:[],
         //审批状态
-        optionsListTwo:[{id:'1',name:'审批中'},{id:'2',name:'已授权'},{id:'3',name:'已拒绝'}]
+        optionsListTwo:[{id:'1',name:'已授权'},{id:'2',name:'已失效'}]
       }
     },
     created() {

src/views/comprehensive/laboratoryManagement/accessAuthorization/authorize.vue

@@ -120,7 +120,7 @@
         total:10,
         tableList:[],
         //审批状态
-        optionsListTwo:[{id:'1',name:'审批中'},{id:'2',name:'已授权'},{id:'3',name:'已拒绝'}],
+        optionsListTwo:[{id:'1',name:'已授权'},{id:'2',name:'已失效'}],
         //详情
         infoData:{},
       }

src/views/emergencyManagement/plan_log/index.vue

@@ -416,12 +416,12 @@ export default {
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
-      if(this.dateRange){
-        this.queryParams.startDate = this.dateRange[0] + " 00:00:00"
-        this.queryParams.endDate = this.dateRange[1] + " 00:00:00"
+      if(this.dateRange[0]){
+        this.queryParams.startDate = this.dateRange[0]
+        this.queryParams.endDate = this.dateRange[1]
       }else {
-        this.queryParams.startDate = undefined  + " 00:00:00"
-        this.queryParams.endDate = undefined  + " 00:00:00"
+        this.queryParams.startDate = null
+        this.queryParams.endDate = null
       }
       console.log(this.queryParams)
       this.getList();
@@ -429,7 +429,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryParams");
-      this.dateRange = null
+      this.dateRange = []
       this.queryParams.startDate = null
       this.queryParams.endDate = null
       this.handleQuery();

src/views/emergencyManagement/smartLoT/control/index.vue

@@ -76,7 +76,7 @@
       </el-form-item>
       <!--<el-form-item label="开始时间" prop="inTime">-->
         <!--<el-date-picker clearable size="small"-->
-                        <!--v-model="queryParams.beginTime"-->
+                        <!--v-model="queryParams.beginTimeStr"-->
                         <!--type="date"-->
                         <!--value-format="yyyy-MM-dd"-->
                         <!--placeholder="请选择开始时间">-->
@@ -84,7 +84,7 @@
       <!--</el-form-item>-->
       <!--<el-form-item label="结束时间" prop="inTime">-->
         <!--<el-date-picker clearable size="small"-->
-                        <!--v-model="queryParams.endTime"-->
+                        <!--v-model="queryParams.endTimeStr"-->
                         <!--type="date"-->
                         <!--value-format="yyyy-MM-dd"-->
                         <!--placeholder="请选择结束时间">-->
@@ -236,8 +236,8 @@ export default {
         userId: null,
         hardwareType: null,
         hardwareTypeEnum: null,
-        beginTime: null,
-        endTime: null
+        beginTimeStr: null,
+        endTimeStr: null
       },
       hardTypeOptions:{},
       // 表单参数
@@ -291,11 +291,11 @@ export default {
     getList() {
       this.loading = true;
       if(this.dateRange[0]){
-        this.queryParams.beginTime = this.dateRange[0];
-        this.queryParams.endTime = this.dateRange[1];
+        this.queryParams.beginTimeStr = this.dateRange[0];
+        this.queryParams.endTimeStr = this.dateRange[1];
       }else {
-        this.queryParams.startDate = undefined  + " 00:00:00"
-        this.queryParams.endDate = undefined  + " 00:00:00"
+        this.queryParams.beginTimeStr = null
+        this.queryParams.endTimeStr = null
       }
       listControl(this.queryParams).then(response => {
         this.controlList = response.rows;
@@ -357,9 +357,9 @@ export default {
     resetQuery() {
       this.dateRange = []
       this.subjectOptions = []
-      this.queryParams.beginTime = null
-      this.queryParams.endTime = null
-      this.queryParams.deptId = ""
+      this.queryParams.beginTimeStr = null
+      this.queryParams.endTimeStr = null
+      this.queryParams.deptId = null
       this.resetForm("queryForm");
       this.handleQuery();
     },

src/views/studentViews/accessAuthorization/index.vue

@@ -105,7 +105,7 @@
         total:10,
         tableList:[],
         //审批状态
-        optionsListTwo:[{id:'1',name:'审批中'},{id:'2',name:'已授权'},{id:'3',name:'已拒绝'}]
+        optionsListTwo:[{id:'1',name:'已授权'},{id:'2',name:'已失效'}]
       }
     },
     created() {