Explorar o código

事项规则查询时间

yijing hai 1 ano
pai
achega
90c9e2ae89

+ 59 - 94
src/views/rulesManagement/matterRules/components/matter-search.vue

@@ -1,22 +1,13 @@
 <!-- 搜索表单 -->
 <template>
-  <el-form
-    label-width="80px"
-    class="ele-form-search"
-    @keyup.enter.native="search"
-    @submit.native.prevent
-  >
+  <el-form label-width="80px" class="ele-form-search" @keyup.enter.native="search" @submit.native.prevent>
     <el-row :gutter="15">
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="规则名称:">
           <el-input clearable v-model.trim="where.name" placeholder="请输入" />
         </el-form-item>
         <el-form-item label="规则状态:">
-          <DictSelection
-            dictName="规则状态"
-            clearable
-            v-model.trim="where.status"
-          >
+          <DictSelection dictName="规则状态" clearable v-model.trim="where.status">
           </DictSelection>
         </el-form-item>
       </el-col>
@@ -25,60 +16,30 @@
           <el-input clearable v-model.trim="where.code" placeholder="请输入" />
         </el-form-item>
         <el-form-item label="创建时间:">
-          <el-date-picker
-            style="width: 100%"
-            v-model="time"
-            type="daterange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            :default-time="['00:00:00', '23:59:59']"
-          >
+          <el-date-picker style="width: 100%" v-model="time" type="daterange" range-separator="至"
+            start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd HH:mm:ss"
+            :default-time="['00:00:00', '23:59:59']">
           </el-date-picker>
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="规则类型:">
-          <DictSelection
-            dictName="规则类型"
-            clearable
-            v-model.trim="where.type"
-          >
+          <DictSelection dictName="规则类型" clearable v-model.trim="where.type">
           </DictSelection>
         </el-form-item>
         <el-form-item label="组织机构:">
-          <auth-selection
-            v-model.trim="where.deptIds"
-            style="width: 100%"
-          ></auth-selection>
+          <auth-selection v-model.trim="where.deptIds" style="width: 100%"></auth-selection>
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="创建人:">
-          <el-input
-            clearable
-            v-model.trim="where.userName"
-            placeholder="请输入"
-          />
+          <el-input clearable v-model.trim="where.userName" placeholder="请输入" />
         </el-form-item>
         <div class="ele-form-actions">
-          <el-button
-            type="primary"
-            icon="el-icon-search"
-            class="ele-btn-icon"
-            @click="search"
-            size="small"
-          >
+          <el-button type="primary" icon="el-icon-search" class="ele-btn-icon" @click="search" size="small">
             查询
           </el-button>
-          <el-button
-            @click="reset"
-            icon="el-icon-refresh-left"
-            size="small"
-            type="primary"
-            >重置</el-button
-          >
+          <el-button @click="reset" icon="el-icon-refresh-left" size="small" type="primary">重置</el-button>
         </div>
       </el-col>
     </el-row>
@@ -86,53 +47,57 @@
 </template>
 
 <script>
-  import { login } from '@/api/login';
-  export default {
-    data() {
-      // 默认表单数据
-      const defaultWhere = {
-        name: '',
-        code: '',
-        userName: '',
-        type: '',
-        status: '',
-        startTime: '',
-        endTime: ''
-      };
-      return {
-        // 表单数据
-        where: { ...defaultWhere },
-        treeData: [],
-        time: []
-      };
-    },
-    computed: {
-      // 是否开启响应式布局
-      styleResponsive() {
-        return this.$store.state.theme.styleResponsive;
-      }
+import { login } from '@/api/login';
+export default {
+  data() {
+    // 默认表单数据
+    const defaultWhere = {
+      name: '',
+      code: '',
+      userName: '',
+      type: '',
+      status: '',
+      startTime: '',
+      endTime: ''
+    };
+    return {
+      // 表单数据
+      where: { ...defaultWhere },
+      treeData: [],
+      time: []
+    };
+  },
+  computed: {
+    // 是否开启响应式布局
+    styleResponsive() {
+      return this.$store.state.theme.styleResponsive;
+    }
+  },
+  created() { },
+  methods: {
+    /* 搜索 */
+    search() {
+
+      const [startTime = '', endTime = ''] = this.time || [];
+      this.$emit('search', {
+        ...this.where,
+        startTime,
+        endTime
+      });
     },
-    created() {},
-    methods: {
-      /* 搜索 */
-      search() {
-        this.where.startTime = this.time ? this.time[0] : '';
-        this.where.endTime = this.time ? this.time[1] : '';
-        this.$emit('search', this.where);
-      },
-      /*  重置 */
-      reset() {
-        this.time = [];
-        this.where = { ...this.defaultWhere };
-        this.search();
-      }
+    /*  重置 */
+    reset() {
+      this.time = [];
+      this.where = { ...this.defaultWhere };
+      this.search();
     }
-  };
+  }
+};
 </script>
 <style lang="scss" scoped>
-  .ele-form-actions {
-    display: flex;
-    align-items: center;
-    justify-content: flex-end;
-  }
+.ele-form-actions {
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+}
 </style>

+ 1 - 1
vue.config.js

@@ -36,7 +36,7 @@ module.exports = {
     proxy: {
       // 当我们的本地的请求 有/api的时候,就会代理我们的请求地址向另外一个服务器发出请求
       '/api': {
-        target: 'http://192.168.1.125:18086',
+        target: 'http://192.168.1.116:18086',
         // target: 'http://192.168.1.158:18086',
         // target: 'http://192.168.1.176:18086',
         // target: 'http://192.168.1.251:18086',