调整查询条件样式

src/api/app.js

@@ -78,7 +78,7 @@ export async function fileUpload(
 }
 
 export function GetStaticResources(MethodName, data) {
-  return http.post(`/GCLSFileServer/ServiceInterface?MethodName=${MethodName}`, data);
+  return http.post(`/OtherSysTool/GCLSBaseServer/SI?MethodName=${MethodName}`, data);
 }
 
 export function GetBookWebSIContent(MethodName, data) {

src/views/org_manage/index.vue

@@ -203,5 +203,9 @@ export default {
   :deep .el-form-item--small.el-form-item {
     margin-bottom: 5px;
   }
+
+  #query-form {
+    text-align: left;
+  }
 }
 </style>

src/views/user_manage/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="user-manage">
     <div class="user-manage-list">
-      <el-form inline id="query-form">
+      <el-form inline id="query-form" label-width="90px">
         <el-form-item prop="real_name" label="真实姓名">
           <el-input v-model="form.real_name"></el-input>
         </el-form-item>
@@ -14,14 +14,10 @@
           </el-select>
         </el-form-item>
         <el-form-item prop="register_date" label="注册日期">
-          <el-date-picker
-            v-model="register_date"
-            type="daterange"
-            range-separator="-"
-            start-placeholder="开始日期"
-            end-placeholder="截止日期"
-            value-format="yyyy-MM-dd"
-          >
+          <el-date-picker v-model="form.register_date_begin" placeholder="开始日期" value-format="yyyy-MM-dd">
+          </el-date-picker>
+          -
+          <el-date-picker v-model="form.register_date_end" placeholder="截止日期" value-format="yyyy-MM-dd">
           </el-date-picker>
         </el-form-item>
         <el-form-item prop="user_name" label="用户名">
@@ -46,14 +42,10 @@
           </el-select>
         </el-form-item>
         <el-form-item prop="stop_date" label="停用日期">
-          <el-date-picker
-            v-model="stop_date"
-            type="daterange"
-            range-separator="-"
-            start-placeholder="开始日期"
-            end-placeholder="截止日期"
-            value-format="yyyy-MM-dd"
-          >
+          <el-date-picker v-model="form.stop_date_begin" placeholder="开始日期" value-format="yyyy-MM-dd">
+          </el-date-picker>
+          -
+          <el-date-picker v-model="form.stop_date_end" placeholder="截止日期" value-format="yyyy-MM-dd">
           </el-date-picker>
         </el-form-item>
         <el-form-item>
@@ -131,8 +123,6 @@ export default {
         page_capacity: 10,
         cur_page: 1,
       },
-      register_date: [],
-      stop_date: [],
       tableHeight: 0,
       org_manager_list: [
         {
@@ -166,20 +156,6 @@ export default {
   },
   methods: {
     queryUserList(data) {
-      if (this.register_date && this.register_date.length === 2) {
-        this.form.register_date_begin = this.register_date[0];
-        this.form.register_date_end = this.register_date[1];
-      } else {
-        this.form.register_date_begin = '';
-        this.form.register_date_end = '';
-      }
-      if (this.stop_date && this.stop_date.length === 2) {
-        this.form.stop_date_begin = this.stop_date[0];
-        this.form.stop_date_end = this.stop_date[1];
-      } else {
-        this.form.stop_date_begin = '';
-        this.form.stop_date_end = '';
-      }
       this.form.page_capacity = data.page_capacity;
       this.form.cur_page = data.cur_page;
       queryUserList(this.form).then(({ total_count, user_list }) => {
@@ -255,5 +231,27 @@ export default {
   :deep .el-range-editor .el-range-input {
     background: transparent;
   }
+
+  :deep .el-select > .el-input {
+    width: 177.5px;
+  }
+
+  :deep .el-date-editor.el-input,
+  .el-date-editor.el-input__inner {
+    width: 130px;
+  }
+
+  :deep .el-date-editor .el-input__inner {
+    width: 130px;
+    padding-right: 20px;
+  }
+
+  #query-form {
+    text-align: left;
+
+    :deep .el-button--small {
+      margin-left: 20px;
+    }
+  }
 }
 </style>

src/views/user_manage_org/index.vue

@@ -8,7 +8,7 @@
         >
         <el-button class="add-btn" type="primary" size="small" @click="updateOrg">批量导入用户</el-button>
       </div>
-      <el-form inline id="query-form">
+      <el-form inline id="query-form" label-width="90px">
         <el-form-item prop="real_name" label="真实姓名">
           <el-input v-model="form.real_name"></el-input>
         </el-form-item>
@@ -26,16 +26,13 @@
           </el-select>
         </el-form-item>
         <el-form-item prop="register_date" label="注册日期">
-          <el-date-picker
-            v-model="register_date"
-            type="daterange"
-            range-separator="-"
-            start-placeholder="开始日期"
-            end-placeholder="截止日期"
-            value-format="yyyy-MM-dd"
-          >
+          <el-date-picker v-model="form.register_date_begin" placeholder="开始日期" value-format="yyyy-MM-dd">
+          </el-date-picker>
+          -
+          <el-date-picker v-model="form.register_date_end" placeholder="截止日期" value-format="yyyy-MM-dd">
           </el-date-picker>
         </el-form-item>
+        <br />
         <el-form-item prop="user_name" label="用户名">
           <el-input v-model="form.user_name"></el-input>
         </el-form-item>
@@ -48,14 +45,10 @@
           </el-select>
         </el-form-item>
         <el-form-item prop="stop_date" label="停用日期">
-          <el-date-picker
-            v-model="stop_date"
-            type="daterange"
-            range-separator="-"
-            start-placeholder="开始日期"
-            end-placeholder="截止日期"
-            value-format="yyyy-MM-dd"
-          >
+          <el-date-picker v-model="form.stop_date_begin" placeholder="开始日期" value-format="yyyy-MM-dd">
+          </el-date-picker>
+          -
+          <el-date-picker v-model="form.stop_date_end" placeholder="截止日期" value-format="yyyy-MM-dd">
           </el-date-picker>
         </el-form-item>
         <el-form-item>
@@ -179,20 +172,6 @@ export default {
     queryOrgList(data) {
       this.form.page_capacity = data.page_capacity;
       this.form.cur_page = data.cur_page;
-      if (this.register_date && this.register_date.length === 2) {
-        this.form.register_date_begin = this.register_date[0];
-        this.form.register_date_end = this.register_date[1];
-      } else {
-        this.form.register_date_begin = '';
-        this.form.register_date_end = '';
-      }
-      if (this.stop_date && this.stop_date.length === 2) {
-        this.form.stop_date_begin = this.stop_date[0];
-        this.form.stop_date_end = this.stop_date[1];
-      } else {
-        this.form.stop_date_begin = '';
-        this.form.stop_date_end = '';
-      }
       queryOrgUserList(this.form).then(({ total_count, user_list }) => {
         this.total = total_count;
         this.list = user_list;
@@ -246,6 +225,7 @@ export default {
 
   .btn-box {
     display: flex;
+    justify-content: start;
 
     .org-name {
       margin-right: 5px;
@@ -269,6 +249,20 @@ export default {
     }
   }
 
+  :deep .el-select > .el-input {
+    width: 177.5px;
+  }
+
+  :deep .el-date-editor.el-input,
+  .el-date-editor.el-input__inner {
+    width: 130px;
+  }
+
+  :deep .el-date-editor .el-input__inner {
+    width: 130px;
+    padding-right: 20px;
+  }
+
   :deep .el-form-item--small.el-form-item {
     margin-bottom: 5px;
   }
@@ -276,5 +270,13 @@ export default {
   :deep .el-range-editor .el-range-input {
     background: transparent;
   }
+
+  #query-form {
+    text-align: left;
+
+    :deep .el-button--small {
+      margin-left: 20px;
+    }
+  }
 }
 </style>