Merge branch 'feature/product_management' into develop

src/views/base/region/index.vue

@@ -15,30 +15,22 @@
             node-key="id"
             :props="defaultProps"
             @node-click="handleNodeClick" />
-          <!-- <el-tree ref="tree" :data="deptOptions" node-key="id" 
-          :filter-node-method="filterNode" :props="defaultProps"
-          @node-click="handleNodeClick" /> -->
         </div>
-        <!-- <div class="buttons">
-    <el-button  @click="getCheckedNodes($event)">添加区域</el-button>
-  </div> -->
-        <vab-query-form-left-panel :span="2">
+        <vab-query-form-left-panel>
           <el-button icon="el-icon-plus" type="primary" @click="getCheckedNodes($event)">添加区域</el-button>
         </vab-query-form-left-panel>
       </el-col>
-      <el-col :span="19" :xs="27">
+      <el-col :sapn="19">
         <vab-query-form>
-          <vab-query-form-left-panel :span="20">
+          <vab-query-form-top-panel>
             <el-form :inline="true" :model="queryForm" @submit.native.prevent>
-              <el-form-item style="letter-spacing: 12px">
-                <el-input v-model.trim="queryForm.custCode" clearable placeholder="客户编码" />
+              <el-form-item prop="custCode">
+                <el-input v-model="queryForm.custCode" clearable placeholder="客户编码" />
               </el-form-item>
-              &nbsp;
 
-              <el-form-item>
-                <el-input v-model.trim="queryForm.custName" clearable placeholder="客户名称" />
+              <el-form-item prop="custName">
+                <el-input v-model="queryForm.custName" clearable placeholder="客户名称" />
               </el-form-item>
-              &nbsp;
               <el-form-item label="" prop="custIndustry">
                 <el-select v-model="custIndustry" placeholder="请选择客户行业" style="width: 100%">
                   <el-option
@@ -48,20 +40,23 @@
                     :value="item.value" />
                 </el-select>
               </el-form-item>
-              <el-form-item style="margin-right: 5px">
+
+              <el-form-item>
                 <el-button icon="el-icon-search" type="primary" @click="queryData">查询</el-button>
                 <el-button icon="el-icon-refresh-right" @click="reset">重置</el-button>
               </el-form-item>
             </el-form>
-            <vab-query-form-left-panel :span="15">
-              <el-button icon="el-icon-plus" type="primary" @click="handleEdit($event)">添加</el-button>
-            </vab-query-form-left-panel>
-          </vab-query-form-left-panel>
-          <vab-query-form-right-panel :span="29">
-            <el-button icon="el-icon-download" />
-            <table-tool :check-list.sync="checkList" :columns="columns" />
-          </vab-query-form-right-panel>
+          </vab-query-form-top-panel>
         </vab-query-form>
+
+        <vab-query-form-left-panel>
+          <el-button icon="el-icon-plus" type="primary" @click="handleEdit($event)">添加</el-button>
+        </vab-query-form-left-panel>
+        <vab-query-form-right-panel>
+          <el-button icon="el-icon-download" />
+          <table-tool :check-list.sync="checkList" :columns="columns" />
+        </vab-query-form-right-panel>
+
         <el-table
           v-loading="listLoading"
           border
@@ -112,6 +107,7 @@
   import RegEdit from './components/RegEdit'
   import regionApi from '@/api/base/region/region'
   import TableTool from '@/components/table/TableTool'
+
   export default {
     name: 'Distr',
     components: { Edit, RegEdit, TableTool },
@@ -301,6 +297,7 @@
     font-weight: bold;
     background-color: #dde9ff !important;
   }
+
   .el-form-item__content {
     margin-right: 3px;
   }

src/views/system/loginLog/index.vue

@@ -3,7 +3,7 @@
     <vab-query-form>
       <vab-query-form-top-panel>
         <el-form :inline="true" :model="queryForm" @submit.native.prevent>
-          <el-form-item label="登录IP" prop="ipaddr">
+          <el-form-item prop="ipaddr">
             <el-input
               v-model="queryForm.ipaddr"
               clearable
@@ -11,7 +11,7 @@
               @keyup.enter.native="queryData" />
           </el-form-item>
 
-          <el-form-item label="登录地点" prop="loginLocation">
+          <el-form-item prop="loginLocation">
             <el-input
               v-model="queryForm.loginLocation"
               clearable
@@ -20,7 +20,7 @@
               @keyup.enter.native="queryData" />
           </el-form-item>
 
-          <el-form-item label="用户名称" prop="userName">
+          <el-form-item prop="userName">
             <el-input
               v-model="queryForm.userName"
               clearable
@@ -28,20 +28,15 @@
               @keyup.enter.native="queryData" />
           </el-form-item>
 
-          <el-form-item label="状态" prop="status">
-            <el-select
-              v-model="queryForm.status"
-              clearable
-              placeholder="登录状态">
+          <el-form-item prop="status">
+            <el-select v-model="queryForm.status" clearable placeholder="登录状态">
               <el-option label="成功" value="10" />
               <el-option label="失败" value="20" />
             </el-select>
           </el-form-item>
 
           <el-form-item>
-            <el-button icon="el-icon-search" type="primary" @click="queryData">
-              查询
-            </el-button>
+            <el-button icon="el-icon-search" type="primary" @click="queryData">查询</el-button>
             <!--            <el-button type="text" @click="handleFold">-->
             <!--              <span v-if="fold">展开</span>-->
             <!--              <span v-else>合并</span>-->
@@ -53,25 +48,15 @@
           </el-form-item>
         </el-form>
       </vab-query-form-top-panel>
-      <vab-query-form-left-panel :span="12">
-        <el-button
-          icon="el-icon-delete"
-          size="mini"
-          type="danger"
-          @click="handleDelete">
-          删除
-        </el-button>
+      <vab-query-form-left-panel>
+        <el-button icon="el-icon-delete" size="mini" type="danger" @click="handleDelete">删除</el-button>
       </vab-query-form-left-panel>
-      <vab-query-form-right-panel :span="12">
+      <vab-query-form-right-panel>
         <table-tool :check-list.sync="checkList" :columns="columns" />
       </vab-query-form-right-panel>
     </vab-query-form>
 
-    <el-table
-      v-loading="listLoading"
-      :data="list"
-      :height="height"
-      @selection-change="setSelectRows">
+    <el-table v-loading="listLoading" :data="list" :height="height" @selection-change="setSelectRows">
       <el-table-column align="center" type="selection" />
       <el-table-column
         v-for="(item, index) in finallyColumns"
@@ -174,9 +159,7 @@
     },
     computed: {
       finallyColumns() {
-        return this.columns.filter((item) =>
-          this.checkList.includes(item.label)
-        )
+        return this.columns.filter((item) => this.checkList.includes(item.label))
       },
     },
     created() {